From: Marek Vasut <marex@denx.de>
Date: Mon, 4 May 2015 20:54:35 +0000 (+0200)
Subject: ARM: bcm283x: Reorder timer.h
X-Git-Tag: v2015.07-rc2~61
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=25a63f5b900715b5cc8b69fcf9b6f23b90daa658;p=platform%2Fkernel%2Fu-boot.git

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 fc7aec7..004c24b 100644
--- 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