Merge tag 'mvebu-dt-5.1-2' of git://git.infradead.org/linux-mvebu into arm/dt

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

diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 07443a387a8f6033e868512a716d55f64bd13afd..79c4956d390215dc1a9f9af2e9df820d79e96baf 100644 (file)
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -9,7 +9,6 @@
  * Licensed under GPLv2 or later.
  */
 
-#include "skeleton.dtsi"
 #include <dt-bindings/dma/at91.h>
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
@@ -17,6 +16,8 @@
 #include <dt-bindings/clock/at91.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Atmel AT91SAM9x5 family SoC";
        compatible = "atmel,at91sam9x5";
        interrupt-parent = <&aic>;
@@ -49,6 +50,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x20000000 0x10000000>;
        };