Merge branch 'next' into for-linus

[linux-2.6-omap-h63xx.git] / arch / powerpc / boot / dts / ep8248e.dts

diff --git a/arch/powerpc/boot/dts/ep8248e.dts b/arch/powerpc/boot/dts/ep8248e.dts
index 5d2fb76a72c12b16ce4dcdd447d599b50ec8ee1d..756758fb5b7b45369fc7f3138eea3ae5f9d93bd5 100644 (file)
--- a/arch/powerpc/boot/dts/ep8248e.dts
+++ b/arch/powerpc/boot/dts/ep8248e.dts
@@ -121,8 +121,7 @@
 
                                data@0 {
                                        compatible = "fsl,cpm-muram-data";
-                                       reg = <0 0x1100 0x1140
-                                              0xec0 0x9800 0x800>;
+                                       reg = <0 0x2000 0x9800 0x800>;
                                };
                        };
 
@@ -138,7 +137,7 @@
                                device_type = "serial";
                                compatible = "fsl,mpc8248-smc-uart",
                                             "fsl,cpm2-smc-uart";
-                               reg = <0x11a80 0x20 0x1100 0x40>;
+                               reg = <0x11a80 0x20 0x87fc 2>;
                                interrupts = <4 8>;
                                interrupt-parent = <&PIC>;
                                fsl,cpm-brg = <7>;