aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2012-06-10 09:20:06 -0400
committerAndrew Lunn <andrew@lunn.ch>2012-07-27 10:48:38 -0400
commit1e7bad0f5b91150fef78d732095ca84ca4a16585 (patch)
treee207c3b588a060914f75f811aff900d70209bce7 /arch/arm/boot
parente91cac0a7746b2ce9d4134098678e3cc8cbf032d (diff)
ARM: Orion: DTify the watchdog timer.
Add device tree support to the Orion watchdog timer, and enable its use in the kirkwood devices using device tree. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@googlemail.com> Tested-by: Simon Baatz <gmbnomis@gmail.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/kirkwood.dtsi6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 3df24cd03c07..458d137d0951 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -70,6 +70,12 @@
70 status = "disabled"; 70 status = "disabled";
71 }; 71 };
72 72
73 wdt@20300 {
74 compatible = "marvell,orion-wdt";
75 reg = <0x20300 0x28>;
76 status = "okay";
77 };
78
73 nand@3000000 { 79 nand@3000000 {
74 #address-cells = <1>; 80 #address-cells = <1>;
75 #size-cells = <1>; 81 #size-cells = <1>;