Merge tag 'mvebu-soc-3.17-4' of git://git.infradead.org/linux-mvebu into next/soc

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / dove.dtsi

diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index 187fd46b7b5ef018c2985e7db5298784338f0507..3b891dd209933551b82a36aa04c6213214fb672c 100644 (file)
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -186,6 +186,11 @@
                                reg = <0x20000 0x80>, <0x800100 0x8>;
                        };
 
+                       sysc: system-ctrl@20000 {
+                               compatible = "marvell,orion-system-controller";
+                               reg = <0x20000 0x110>;
+                       };
+
                        bridge_intc: bridge-interrupt-ctrl@20110 {
                                compatible = "marvell,orion-bridge-intc";
                                interrupt-controller;
@@ -210,6 +215,14 @@
                                clocks = <&core_clk 0>;
                        };
 
+                       watchdog@20300 {
+                               compatible = "marvell,orion-wdt";
+                               reg = <0x20300 0x28>, <0x20108 0x4>;
+                               interrupt-parent = <&bridge_intc>;
+                               interrupts = <3>;
+                               clocks = <&core_clk 0>;
+                       };
+
                        crypto: crypto-engine@30000 {
                                compatible = "marvell,orion-crypto";
                                reg = <0x30000 0x10000>,
@@ -381,7 +394,8 @@
 
                        pinctrl: pin-ctrl@d0200 {
                                compatible = "marvell,dove-pinctrl";
-                               reg = <0xd0200 0x10>;
+                               reg = <0xd0200 0x14>,
+                                     <0xd0440 0x04>;
                                clocks = <&gate_clk 22>;
 
                                pmx_gpio_0: pmx-gpio-0 {
@@ -603,6 +617,12 @@
                                reg = <0xd8500 0x20>;
                        };
 
+                       gconf: global-config@e802c {
+                               compatible = "marvell,dove-global-config",
+                                            "syscon";
+                               reg = <0xe802c 0x14>;
+                       };
+
                        gpio2: gpio-ctrl@e8400 {
                                compatible = "marvell,orion-gpio";
                                #gpio-cells = <2>;