summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeresa Gámez <t.gamez@phytec.de>2012-07-24 13:45:03 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-07-25 08:36:33 +0200
commit7b0de0e6fac6646007091abb976e06115d254142 (patch)
tree3734a88c35679c851b67c4beeb4e0cf611dc754f
parent5fa342b291bdc0ebea73558864af46f533306eb8 (diff)
downloadbarebox-7b0de0e6fac6646007091abb976e06115d254142.tar.gz
barebox-7b0de0e6fac6646007091abb976e06115d254142.tar.xz
OMAP4: small header cleanup
Use <mach/clocks.h> for OMAP4. Signed-off-by: Teresa Gámez <t.gamez@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-omap/include/mach/clocks.h3
-rw-r--r--arch/arm/mach-omap/omap4_clock.c4
-rw-r--r--arch/arm/mach-omap/omap4_generic.c5
3 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/mach-omap/include/mach/clocks.h b/arch/arm/mach-omap/include/mach/clocks.h
index 1221238de8..3efa057931 100644
--- a/arch/arm/mach-omap/include/mach/clocks.h
+++ b/arch/arm/mach-omap/include/mach/clocks.h
@@ -44,5 +44,8 @@
#ifdef CONFIG_ARCH_OMAP3
#include <mach/omap3-clock.h>
#endif
+#ifdef CONFIG_ARCH_OMAP4
+#include <mach/omap4-clock.h>
+#endif
#endif /* __OMAP_CLOCKS_H_ */
diff --git a/arch/arm/mach-omap/omap4_clock.c b/arch/arm/mach-omap/omap4_clock.c
index f8bab5f93a..3ab01f0d3a 100644
--- a/arch/arm/mach-omap/omap4_clock.c
+++ b/arch/arm/mach-omap/omap4_clock.c
@@ -1,7 +1,7 @@
#include <common.h>
-#include <mach/syslib.h>
#include <io.h>
-#include <mach/omap4-clock.h>
+#include <mach/syslib.h>
+#include <mach/clocks.h>
#define LDELAY 12000000
diff --git a/arch/arm/mach-omap/omap4_generic.c b/arch/arm/mach-omap/omap4_generic.c
index 5092242103..de6993475d 100644
--- a/arch/arm/mach-omap/omap4_generic.c
+++ b/arch/arm/mach-omap/omap4_generic.c
@@ -1,10 +1,9 @@
#include <common.h>
#include <init.h>
-#include <mach/silicon.h>
#include <io.h>
-#include <mach/omap4-silicon.h>
+#include <mach/clocks.h>
+#include <mach/silicon.h>
#include <mach/omap4-mux.h>
-#include <mach/omap4-clock.h>
#include <mach/syslib.h>
#include <mach/xload.h>
#include <mach/gpmc.h>