diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2012-01-10 23:44:19 +0400 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2012-03-13 17:45:52 +0400 |
| commit | 7ac9b9eb338d3960fbc044cb76790f4aab4fbb22 (patch) | |
| tree | b564f7b854f4da60943b503bcc03e79b8ea95379 /arch/arm/boot/dts/highbank.dts | |
| parent | 08efd6ca6fae8ee22617b8d9d3f87d4e4cd56dab (diff) | |
| download | linux-7ac9b9eb338d3960fbc044cb76790f4aab4fbb22.tar.xz | |
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/boot/dts/highbank.dts')
| -rw-r--r-- | arch/arm/boot/dts/highbank.dts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/highbank.dts b/arch/arm/boot/dts/highbank.dts index 305635bd45c0..37c0ff9c8b90 100644 --- a/arch/arm/boot/dts/highbank.dts +++ b/arch/arm/boot/dts/highbank.dts @@ -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 { |