diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-13 11:53:09 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-13 11:53:09 +0000 |
| commit | a2821146e6f69566a384b368b90c22e84aaf7ef3 (patch) | |
| tree | 6a1534ff81cdc4e65b461f69108019e49481ccea /arch/arm/include/asm/hardware/arm_timer.h | |
| parent | 69adb983ce0639d02c87aa9947663d5ad50116d0 (diff) | |
| parent | e129440af63879808ee0a40613fd1cece935678e (diff) | |
Merge branch 'vexpress/timer' into next/timer
* vexpress/timer:
ARM: versatile: Map local timers using Device Tree when possible
ARM: vexpress: Get rid of MMIO_P2V
Diffstat (limited to 'arch/arm/include/asm/hardware/arm_timer.h')
| -rw-r--r-- | arch/arm/include/asm/hardware/arm_timer.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/include/asm/hardware/arm_timer.h b/arch/arm/include/asm/hardware/arm_timer.h index c0f4e7bf22de..d6030ff599db 100644 --- a/arch/arm/include/asm/hardware/arm_timer.h +++ b/arch/arm/include/asm/hardware/arm_timer.h @@ -9,7 +9,12 @@ * * Integrator AP has 16-bit timers, Integrator CP, Versatile and Realview * can have 16-bit or 32-bit selectable via a bit in the control register. + * + * Every SP804 contains two identical timers. */ +#define TIMER_1_BASE 0x00 +#define TIMER_2_BASE 0x20 + #define TIMER_LOAD 0x00 /* ACVR rw */ #define TIMER_VALUE 0x04 /* ACVR ro */ #define TIMER_CTRL 0x08 /* ACVR rw */ |