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

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / ox820.dtsi

diff --git a/arch/arm/boot/dts/ox820.dtsi b/arch/arm/boot/dts/ox820.dtsi
index 085bbd33eadc25a4dc1d3fe6d635794c978b716f..f3239586f38d3b90e1923386b7ea98dfcd8b2bb1 100644 (file)
--- a/arch/arm/boot/dts/ox820.dtsi
+++ b/arch/arm/boot/dts/ox820.dtsi
@@ -6,12 +6,13 @@
  * Licensed under GPLv2 or later
  */
 
-/include/ "skeleton.dtsi"
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/clock/oxsemi,ox820.h>
 #include <dt-bindings/reset/oxsemi,ox820.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        compatible = "oxsemi,ox820";
 
        cpus {
@@ -35,6 +36,7 @@
        };
 
        memory {
+               device_type = "memory";
                /* Max 512MB @ 0x60000000 */
                reg = <0x60000000 0x20000000>;
        };