diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2012-01-10 14:44:19 -0500 |
---|---|---|
committer | Marc Zyngier <marc.zyngier@arm.com> | 2012-03-13 09:45:52 -0400 |
commit | 7ac9b9eb338d3960fbc044cb76790f4aab4fbb22 (patch) | |
tree | b564f7b854f4da60943b503bcc03e79b8ea95379 /arch/arm/mach-highbank/highbank.c | |
parent | 08efd6ca6fae8ee22617b8d9d3f87d4e4cd56dab (diff) |
ARM: highbank: convert to twd_local_timer_register() interface
Add support for the new smp_twd runtime registration interface
to the highbank platforms, and remove the old compile-time support.
The highbank DTS file is updated to match the TWD DT documentation
and fixes the timer trigger (rising edge).
Acked-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm/mach-highbank/highbank.c')
-rw-r--r-- | arch/arm/mach-highbank/highbank.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index 8394d512a402..bb1684f9b68b 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <asm/cacheflush.h> | 27 | #include <asm/cacheflush.h> |
28 | #include <asm/smp_plat.h> | 28 | #include <asm/smp_plat.h> |
29 | #include <asm/smp_scu.h> | 29 | #include <asm/smp_scu.h> |
30 | #include <asm/smp_twd.h> | ||
30 | #include <asm/hardware/arm_timer.h> | 31 | #include <asm/hardware/arm_timer.h> |
31 | #include <asm/hardware/timer-sp.h> | 32 | #include <asm/hardware/timer-sp.h> |
32 | #include <asm/hardware/gic.h> | 33 | #include <asm/hardware/gic.h> |
@@ -111,6 +112,8 @@ static void __init highbank_timer_init(void) | |||
111 | 112 | ||
112 | sp804_clocksource_init(timer_base + 0x20, "timer1"); | 113 | sp804_clocksource_init(timer_base + 0x20, "timer1"); |
113 | sp804_clockevents_init(timer_base, irq, "timer0"); | 114 | sp804_clockevents_init(timer_base, irq, "timer0"); |
115 | |||
116 | twd_local_timer_of_register(); | ||
114 | } | 117 | } |
115 | 118 | ||
116 | static struct sys_timer highbank_timer = { | 119 | static struct sys_timer highbank_timer = { |