Skip to content

Commit

Permalink
ARM: highbank: convert to twd_local_timer_register() interface
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Marc Zyngier committed Mar 13, 2012
1 parent 08efd6c commit 7ac9b9e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 45 deletions.
8 changes: 4 additions & 4 deletions arch/arm/boot/dts/highbank.dts
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,15 @@
ranges;

timer@fff10600 {
compatible = "arm,smp-twd";
compatible = "arm,cortex-a9-twd-timer";
reg = <0xfff10600 0x20>;
interrupts = <1 13 0xf04>;
interrupts = <1 13 0xf01>;
};

watchdog@fff10620 {
compatible = "arm,cortex-a9-wdt";
compatible = "arm,cortex-a9-twd-wdt";
reg = <0xfff10620 0x20>;
interrupts = <1 14 0xf04>;
interrupts = <1 14 0xf01>;
};

intc: interrupt-controller@fff11000 {
Expand Down
1 change: 0 additions & 1 deletion arch/arm/mach-highbank/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
obj-y := clock.o highbank.o system.o
obj-$(CONFIG_DEBUG_HIGHBANK_UART) += lluart.o
obj-$(CONFIG_SMP) += platsmp.o
obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
obj-$(CONFIG_PM_SLEEP) += pm.o
3 changes: 3 additions & 0 deletions arch/arm/mach-highbank/highbank.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
#include <asm/smp_scu.h>
#include <asm/smp_twd.h>
#include <asm/hardware/arm_timer.h>
#include <asm/hardware/timer-sp.h>
#include <asm/hardware/gic.h>
Expand Down Expand Up @@ -111,6 +112,8 @@ static void __init highbank_timer_init(void)

sp804_clocksource_init(timer_base + 0x20, "timer1");
sp804_clockevents_init(timer_base, irq, "timer0");

twd_local_timer_of_register();
}

static struct sys_timer highbank_timer = {
Expand Down
40 changes: 0 additions & 40 deletions arch/arm/mach-highbank/localtimer.c

This file was deleted.

0 comments on commit 7ac9b9e

Please sign in to comment.