ARM: bcm283x: Reorder timer.h

Reorder the timer.h file so it can be included from board config file.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Tyler Baker <tyler.baker@linaro.org>

diff --git a/arch/arm/mach-bcm283x/include/mach/timer.h b/arch/arm/mach-bcm283x/include/mach/timer.h
index fc7aec7b7c592f94adebbd58664cdf642f7e7919..004c24be365a4721c8952e0cf542c013191b6bbf 100644 (file)
--- a/arch/arm/mach-bcm283x/include/mach/timer.h
+++ b/arch/arm/mach-bcm283x/include/mach/timer.h
@@ -13,6 +13,14 @@
 #define BCM2835_TIMER_PHYSADDR 0x20003000
 #endif
 
+#define BCM2835_TIMER_CS_M3    (1 << 3)
+#define BCM2835_TIMER_CS_M2    (1 << 2)
+#define BCM2835_TIMER_CS_M1    (1 << 1)
+#define BCM2835_TIMER_CS_M0    (1 << 0)
+
+#ifndef __ASSEMBLY__
+#include <linux/types.h>
+
 struct bcm2835_timer_regs {
        u32 cs;
        u32 clo;
@@ -23,11 +31,8 @@ struct bcm2835_timer_regs {
        u32 c3;
 };
 
-#define BCM2835_TIMER_CS_M3    (1 << 3)
-#define BCM2835_TIMER_CS_M2    (1 << 2)
-#define BCM2835_TIMER_CS_M1    (1 << 1)
-#define BCM2835_TIMER_CS_M0    (1 << 0)
-
 extern ulong get_timer_us(ulong base);
 
 #endif
+
+#endif