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/boot/dts/highbank.dts | |
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/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 @@ | |||
72 | ranges; | 72 | ranges; |
73 | 73 | ||
74 | timer@fff10600 { | 74 | timer@fff10600 { |
75 | compatible = "arm,smp-twd"; | 75 | compatible = "arm,cortex-a9-twd-timer"; |
76 | reg = <0xfff10600 0x20>; | 76 | reg = <0xfff10600 0x20>; |
77 | interrupts = <1 13 0xf04>; | 77 | interrupts = <1 13 0xf01>; |
78 | }; | 78 | }; |
79 | 79 | ||
80 | watchdog@fff10620 { | 80 | watchdog@fff10620 { |
81 | compatible = "arm,cortex-a9-wdt"; | 81 | compatible = "arm,cortex-a9-twd-wdt"; |
82 | reg = <0xfff10620 0x20>; | 82 | reg = <0xfff10620 0x20>; |
83 | interrupts = <1 14 0xf04>; | 83 | interrupts = <1 14 0xf01>; |
84 | }; | 84 | }; |
85 | 85 | ||
86 | intc: interrupt-controller@fff11000 { | 86 | intc: interrupt-controller@fff11000 { |