Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[cascardo/linux.git] / arch / arm / boot / dts / berlin2.dtsi

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 {