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 2ddc85d..2c49524 100644 (file)
--- a/arch/arm/boot/dts/sama5d2.dtsi
+++ b/arch/arm/boot/dts/sama5d2.dtsi
@@ -656,6 +656,7 @@
                                clocks = <&pmc PMC_TYPE_PERIPHERAL 51>;
                                #address-cells = <1>;
                                #size-cells = <1>;
+                               no-memory-wc;
                                ranges = <0 0xf8044000 0x1420>;
                        };
 
@@ -724,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>;
@@ -1130,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>;
@@ -1140,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";
                        };