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

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

diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi
index 4d70194fd80833f23f5c9ff789accc5ea83e2ca3..5653e70c84b4b9686034c90968da157ba0c351fa 100644 (file)
--- a/arch/arm/boot/dts/at91sam9rl.dtsi
+++ b/arch/arm/boot/dts/at91sam9rl.dtsi
@@ -38,16 +38,17 @@
        };
 
        cpus {
-               #address-cells = <0>;
+               #address-cells = <1>;
                #size-cells = <0>;
 
-               cpu {
+               cpu@0 {
                        compatible = "arm,arm926ej-s";
                        device_type = "cpu";
+                       reg = <0>;
                };
        };
 
-       memory {
+       memory@20000000 {
                device_type = "memory";
                reg = <0x20000000 0x04000000>;
        };
@@ -75,6 +76,9 @@
        sram: sram@300000 {
                compatible = "mmio-sram";
                reg = <0x00300000 0x10000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges = <0 0x00300000 0x10000>;
        };
 
        ahb {