Merge tag 'berlin-dt-for-v4.9-1' of git://git.infradead.org/users/hesselba/linux...

Berlin DT changes for v4.9
- enable dw wdt nodes unconditionally,
  driver supports multiple instances now
- fix some dtc compiler warnings

* tag 'berlin-dt-for-v4.9-1' of git://git.infradead.org/users/hesselba/linux-berlin:
  ARM: dts: sony-nsz-gs7: add missing unit name to /memory node
  ARM: dts: chromecast: add missing unit name to /memory node
  ARM: dts: berlin2q-marvell-dmp: add missing unit name to /memory node
  ARM: dts: berlin2: Add missing unit name to /soc node
  ARM: dts: berlin2cd: Add missing unit name to /soc node
  ARM: dts: berlin2q: Add missing unit name to /soc node
  ARM: dts: berlin2: Remove skeleton.dtsi inclusion
  ARM: dts: berlin2cd: Remove skeleton.dtsi inclusion
  ARM: dts: berlin2q: Remove skeleton.dtsi inclusion
  arm: dts: berlin2q: enable all wdt nodes unconditionally
  arm: dts: berlin2: enable all wdt nodes unconditionally

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts b/arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts
index 3c0907b..1c47579 100644 (file)
--- a/arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts
+++ b/arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts
@@ -49,7 +49,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x00000000 0x40000000>; /* 1 GB */
        };

diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi
index ae81009..425c489 100644 (file)
--- a/arch/arm/boot/dts/berlin2.dtsi
+++ b/arch/arm/boot/dts/berlin2.dtsi
@@ -39,13 +39,14 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "skeleton.dtsi"
 #include <dt-bindings/clock/berlin2.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
 / {
        model = "Marvell Armada 1500 (BG2) SoC";
        compatible = "marvell,berlin2", "marvell,berlin";
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        aliases {
                serial0 = &uart0;
@@ -89,7 +90,7 @@
                clock-frequency = <25000000>;
        };
 
-       soc {
+       soc@f7000000 {
                compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;
@@ -447,7 +448,6 @@
                                reg = <0x2000 0x100>;
                                clocks = <&refclk>;
                                interrupts = <1>;
-                               status = "disabled";
                        };
 
                        wdt2: watchdog@3000 {
@@ -455,7 +455,6 @@
                                reg = <0x3000 0x100>;
                                clocks = <&refclk>;
                                interrupts = <2>;
-                               status = "disabled";
                        };
 
                        sm_gpio1: gpio@5000 {

diff --git a/arch/arm/boot/dts/berlin2cd-google-chromecast.dts b/arch/arm/boot/dts/berlin2cd-google-chromecast.dts
index 8ba8b50..ca24def 100644 (file)
--- a/arch/arm/boot/dts/berlin2cd-google-chromecast.dts
+++ b/arch/arm/boot/dts/berlin2cd-google-chromecast.dts
@@ -50,7 +50,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x00000000 0x20000000>; /* 512 MB */
        };

diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi
index 6d06b61..4fe1574 100644 (file)
--- a/arch/arm/boot/dts/berlin2cd.dtsi
+++ b/arch/arm/boot/dts/berlin2cd.dtsi
@@ -39,13 +39,14 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "skeleton.dtsi"
 #include <dt-bindings/clock/berlin2.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
 / {
        model = "Marvell Armada 1500-mini (BG2CD) SoC";
        compatible = "marvell,berlin2cd", "marvell,berlin";
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        aliases {
                serial0 = &uart0;
@@ -78,7 +79,7 @@
                clock-frequency = <25000000>;
        };
 
-       soc {
+       soc@f7000000 {
                compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;

diff --git a/arch/arm/boot/dts/berlin2q-marvell-dmp.dts b/arch/arm/boot/dts/berlin2q-marvell-dmp.dts
index 33b2875..f485308 100644 (file)
--- a/arch/arm/boot/dts/berlin2q-marvell-dmp.dts
+++ b/arch/arm/boot/dts/berlin2q-marvell-dmp.dts
@@ -43,7 +43,7 @@
        model = "Marvell BG2-Q DMP";
        compatible = "marvell,berlin2q-dmp", "marvell,berlin2q", "marvell,berlin";
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x00000000 0x80000000>;
        };

diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi
index 2c34bfb..e548229 100644 (file)
--- a/arch/arm/boot/dts/berlin2q.dtsi
+++ b/arch/arm/boot/dts/berlin2q.dtsi
@@ -37,11 +37,11 @@
 #include <dt-bindings/clock/berlin2q.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
-#include "skeleton.dtsi"
-
 / {
        model = "Marvell Armada 1500 pro (BG2-Q) SoC";
        compatible = "marvell,berlin2q", "marvell,berlin";
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        aliases {
                serial0 = &uart0;
@@ -99,7 +99,7 @@
                clock-frequency = <25000000>;
        };
 
-       soc {
+       soc@f7000000 {
                compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;
@@ -525,7 +525,6 @@
                                reg = <0x2000 0x100>;
                                clocks = <&refclk>;
                                interrupts = <1>;
-                               status = "disabled";
                        };
 
                        wdt2: watchdog@3000 {
@@ -533,7 +532,6 @@
                                reg = <0x3000 0x100>;
                                clocks = <&refclk>;
                                interrupts = <2>;
-                               status = "disabled";
                        };
 
                        sm_gpio1: gpio@5000 {