Merge remote-tracking branch 'origin/master' into perf/core

[linux-2.6-microblaze.git] / arch / arm / boot / dts / sama5d2.dtsi

diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi
index d7f2570..2ddc85d 100644 (file)
--- a/arch/arm/boot/dts/sama5d2.dtsi
+++ b/arch/arm/boot/dts/sama5d2.dtsi
@@ -72,7 +72,7 @@
                };
        };
 
-       memory {
+       memory@20000000 {
                device_type = "memory";
                reg = <0x20000000 0x20000000>;
        };
@@ -94,6 +94,9 @@
        ns_sram: sram@200000 {
                compatible = "mmio-sram";
                reg = <0x00200000 0x20000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges = <0 0x00200000 0x20000>;
        };
 
        ahb {
@@ -106,6 +109,10 @@
                        compatible = "mmio-sram";
                        no-memory-wc;
                        reg = <0x00100000 0x2400>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0 0x00100000 0x2400>;
+
                };
 
                usb0: gadget@300000 {
@@ -535,6 +542,8 @@
                                        compatible = "atmel,at91rm9200-spi";
                                        reg = <0x400 0x200>;
                                        interrupts = <19 IRQ_TYPE_LEVEL_HIGH 7>;
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
                                        clocks = <&pmc PMC_TYPE_PERIPHERAL 19>;
                                        clock-names = "spi_clk";
                                        dmas = <&dma0
@@ -603,6 +612,8 @@
                                        compatible = "atmel,at91rm9200-spi";
                                        reg = <0x400 0x200>;
                                        interrupts = <20 IRQ_TYPE_LEVEL_HIGH 7>;
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
                                        clocks = <&pmc PMC_TYPE_PERIPHERAL 20>;
                                        clock-names = "spi_clk";
                                        dmas = <&dma0
@@ -810,6 +821,8 @@
                                        compatible = "atmel,at91rm9200-spi";
                                        reg = <0x400 0x200>;
                                        interrupts = <21 IRQ_TYPE_LEVEL_HIGH 7>;
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
                                        clocks = <&pmc PMC_TYPE_PERIPHERAL 21>;
                                        clock-names = "spi_clk";
                                        dmas = <&dma0
@@ -878,6 +891,8 @@
                                        compatible = "atmel,at91rm9200-spi";
                                        reg = <0x400 0x200>;
                                        interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>;
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
                                        clocks = <&pmc PMC_TYPE_PERIPHERAL 22>;
                                        clock-names = "spi_clk";
                                        dmas = <&dma0
@@ -947,6 +962,8 @@
                                        compatible = "atmel,at91rm9200-spi";
                                        reg = <0x400 0x200>;
                                        interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
                                        clocks = <&pmc PMC_TYPE_PERIPHERAL 23>;
                                        clock-names = "spi_clk";
                                        dmas = <&dma0