Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[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..2c49524 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
@@ -645,6 +656,7 @@
                                clocks = <&pmc PMC_TYPE_PERIPHERAL 51>;
                                #address-cells = <1>;
                                #size-cells = <1>;
+                               no-memory-wc;
                                ranges = <0 0xf8044000 0x1420>;
                        };
 
@@ -713,7 +725,7 @@
 
                        can0: can@f8054000 {
                                compatible = "bosch,m_can";
-                               reg = <0xf8054000 0x4000>, <0x210000 0x4000>;
+                               reg = <0xf8054000 0x4000>, <0x210000 0x1c00>;
                                reg-names = "m_can", "message_ram";
                                interrupts = <56 IRQ_TYPE_LEVEL_HIGH 7>,
                                             <64 IRQ_TYPE_LEVEL_HIGH 7>;
@@ -810,6 +822,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 +892,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 +963,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
@@ -1113,7 +1131,7 @@
 
                        can1: can@fc050000 {
                                compatible = "bosch,m_can";
-                               reg = <0xfc050000 0x4000>, <0x210000 0x4000>;
+                               reg = <0xfc050000 0x4000>, <0x210000 0x3800>;
                                reg-names = "m_can", "message_ram";
                                interrupts = <57 IRQ_TYPE_LEVEL_HIGH 7>,
                                             <65 IRQ_TYPE_LEVEL_HIGH 7>;
@@ -1123,7 +1141,7 @@
                                assigned-clocks = <&pmc PMC_TYPE_GCK 57>;
                                assigned-clock-parents = <&pmc PMC_TYPE_CORE PMC_UTMI>;
                                assigned-clock-rates = <40000000>;
-                               bosch,mram-cfg = <0x1100 0 0 64 0 0 32 32>;
+                               bosch,mram-cfg = <0x1c00 0 0 64 0 0 32 32>;
                                status = "disabled";
                        };