Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / arch / arm / boot / dts / berlin2q.dtsi

diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi
index fb1da99996ea43f9c3492591e9faf800030d5989..2c34bfb13632079331c7122bccc5650c688cf630 100644 (file)
--- a/arch/arm/boot/dts/berlin2q.dtsi
+++ b/arch/arm/boot/dts/berlin2q.dtsi
@@ -311,7 +311,6 @@
                                #address-cells = <1>;
                                #size-cells = <0>;
                                reg = <0x1400 0x100>;
-                               interrupt-parent = <&aic>;
                                interrupts = <4>;
                                clocks = <&chip_clk CLKID_CFG>;
                                pinctrl-0 = <&twsi0_pmux>;
@@ -324,7 +323,6 @@
                                #address-cells = <1>;
                                #size-cells = <0>;
                                reg = <0x1800 0x100>;
-                               interrupt-parent = <&aic>;
                                interrupts = <5>;
                                clocks = <&chip_clk CLKID_CFG>;
                                pinctrl-0 = <&twsi1_pmux>;
@@ -419,6 +417,11 @@
                        soc_pinctrl: pin-controller {
                                compatible = "marvell,berlin2q-soc-pinctrl";
 
+                               sd1_pmux: sd1-pmux {
+                                       groups = "G31";
+                                       function = "sd1";
+                               };
+
                                twsi0_pmux: twsi0-pmux {
                                        groups = "G6";
                                        function = "twsi0";
@@ -510,6 +513,29 @@
                        ranges = <0 0xfc0000 0x10000>;
                        interrupt-parent = <&sic>;
 
+                       wdt0: watchdog@1000 {
+                               compatible = "snps,dw-wdt";
+                               reg = <0x1000 0x100>;
+                               clocks = <&refclk>;
+                               interrupts = <0>;
+                       };
+
+                       wdt1: watchdog@2000 {
+                               compatible = "snps,dw-wdt";
+                               reg = <0x2000 0x100>;
+                               clocks = <&refclk>;
+                               interrupts = <1>;
+                               status = "disabled";
+                       };
+
+                       wdt2: watchdog@3000 {
+                               compatible = "snps,dw-wdt";
+                               reg = <0x3000 0x100>;
+                               clocks = <&refclk>;
+                               interrupts = <2>;
+                               status = "disabled";
+                       };
+
                        sm_gpio1: gpio@5000 {
                                compatible = "snps,dw-apb-gpio";
                                reg = <0x5000 0x400>;
@@ -530,7 +556,6 @@
                                #address-cells = <1>;
                                #size-cells = <0>;
                                reg = <0x7000 0x100>;
-                               interrupt-parent = <&sic>;
                                interrupts = <6>;
                                clocks = <&refclk>;
                                pinctrl-0 = <&twsi2_pmux>;
@@ -543,7 +568,6 @@
                                #address-cells = <1>;
                                #size-cells = <0>;
                                reg = <0x8000 0x100>;
-                               interrupt-parent = <&sic>;
                                interrupts = <7>;
                                clocks = <&refclk>;
                                pinctrl-0 = <&twsi3_pmux>;
@@ -554,7 +578,6 @@
                        uart0: uart@9000 {
                                compatible = "snps,dw-apb-uart";
                                reg = <0x9000 0x100>;
-                               interrupt-parent = <&sic>;
                                interrupts = <8>;
                                clocks = <&refclk>;
                                reg-shift = <2>;
@@ -566,7 +589,6 @@
                        uart1: uart@a000 {
                                compatible = "snps,dw-apb-uart";
                                reg = <0xa000 0x100>;
-                               interrupt-parent = <&sic>;
                                interrupts = <9>;
                                clocks = <&refclk>;
                                reg-shift = <2>;