projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 05afeeb)
ARM: kirkwood: Add RSTOUT 'reg' entry to devicetree
authorEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Mon, 10 Feb 2014 23:00:33 +0000 (20:00 -0300)
committerJason Cooper <jason@lakedaemon.net>
Mon, 17 Feb 2014 21:44:09 +0000 (21:44 +0000)
In order to support multiplatform builds the watchdog devicetree binding
was modified and now the 'reg' property is specified to need two
entries. This commit adds the second entry as-per the new specification.

Tested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
arch/arm/boot/dts/kirkwood.dtsi patch | blob | blame | history

diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 6abf44d257dfa3fd7cadd8ca85a005d4ad9eed8f..85542c2f34b145c3be24ee99abadc2c905ab1925 100644 (file)
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -178,7 +178,7 @@
 
                wdt: watchdog-timer@20300 {
                        compatible = "marvell,orion-wdt";
-                       reg = <0x20300 0x28>;
+                       reg = <0x20300 0x28>, <0x20108 0x4>;
                        interrupt-parent = <&bridge_intc>;
                        interrupts = <3>;
                        clocks = <&gate_clk 7>;