summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2015-05-04 22:54:35 +0200
committerTom Rini <trini@konsulko.com>2015-05-28 08:18:23 -0400
commit25a63f5b900715b5cc8b69fcf9b6f23b90daa658 (patch)
tree4b1e4b84a1ee1358368ecb317bdff739c17b99e0 /arch
parentbe723556368f862d21760dd38275f876dec7c459 (diff)
downloadu-boot-imx-25a63f5b900715b5cc8b69fcf9b6f23b90daa658.zip
u-boot-imx-25a63f5b900715b5cc8b69fcf9b6f23b90daa658.tar.gz
u-boot-imx-25a63f5b900715b5cc8b69fcf9b6f23b90daa658.tar.bz2
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-bcm283x/include/mach/timer.h15
1 files changed, 10 insertions, 5 deletions
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