From 25a63f5b900715b5cc8b69fcf9b6f23b90daa658 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Mon, 4 May 2015 22:54:35 +0200 Subject: [PATCH] ARM: bcm283x: Reorder timer.h Reorder the timer.h file so it can be included from board config file. Signed-off-by: Marek Vasut Cc: Stephen Warren Cc: Tyler Baker --- arch/arm/mach-bcm283x/include/mach/timer.h | 15 ++++++++++----- 1 file 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 fc7aec7b7c..004c24be36 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 + 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 -- 2.25.1