diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2008-04-18 22:43:11 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2008-04-18 22:43:11 +0100 |
| commit | 80192735e4b01a2e4d437699f2e9b5b93dfab13c (patch) | |
| tree | 1096c3278bc60c925f1818c776e4b3e88c20a23c /include | |
| parent | a44ddfd5bf5354281eebd0f0ae0d6dcf8818fc5c (diff) | |
RealView: Move the timer definitions into the EB specific files
This patch moves the timer definitions from platform.h into board-eb.h
as they are different on PB11MPCore and PB1176. It also adds
timerX_va_base variables in core.c which are set by the
realview_eb_timer_init function before invoking realview_timer_init.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-realview/board-eb.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/arch-realview/platform.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/arch-realview/board-eb.h b/include/asm-arm/arch-realview/board-eb.h index 8adb81e7d1b..142d77a72f3 100644 --- a/include/asm-arm/arch-realview/board-eb.h +++ b/include/asm-arm/arch-realview/board-eb.h @@ -26,6 +26,8 @@ /* * RealView EB + ARM11MPCore peripheral addresses */ +#define REALVIEW_EB_TIMER0_1_BASE 0x10011000 /* Timer 0 and 1 */ +#define REALVIEW_EB_TIMER2_3_BASE 0x10012000 /* Timer 2 and 3 */ #define REALVIEW_EB_GIC_CPU_BASE 0x10040000 /* Generic interrupt controller CPU interface */ #define REALVIEW_EB_GIC_DIST_BASE 0x10041000 /* Generic interrupt controller distributor */ diff --git a/include/asm-arm/arch-realview/platform.h b/include/asm-arm/arch-realview/platform.h index 08d6f05ce0a..7aa78a5ebc8 100644 --- a/include/asm-arm/arch-realview/platform.h +++ b/include/asm-arm/arch-realview/platform.h @@ -190,8 +190,6 @@ #define REALVIEW_SCI_BASE 0x1000E000 /* Smart card controller */ /* Reserved 0x1000F000 */ #define REALVIEW_WATCHDOG_BASE 0x10010000 /* watchdog interface */ -#define REALVIEW_TIMER0_1_BASE 0x10011000 /* Timer 0 and 1 */ -#define REALVIEW_TIMER2_3_BASE 0x10012000 /* Timer 2 and 3 */ #define REALVIEW_GPIO0_BASE 0x10013000 /* GPIO port 0 */ #define REALVIEW_GPIO1_BASE 0x10014000 /* GPIO port 1 */ #define REALVIEW_GPIO2_BASE 0x10015000 /* GPIO port 2 */ |