Merge tag 'for-linus-20140127' of git://git.infradead.org/linux-mtd

[cascardo/linux.git] / arch / powerpc / boot / dts / ep8248e.dts

diff --git a/arch/powerpc/boot/dts/ep8248e.dts b/arch/powerpc/boot/dts/ep8248e.dts
index 5d2fb76..8b3a49f 100644 (file)
--- a/arch/powerpc/boot/dts/ep8248e.dts
+++ b/arch/powerpc/boot/dts/ep8248e.dts
@@ -67,7 +67,6 @@
                        ranges;
 
                        mdio {
-                               device_type = "mdio";
                                compatible = "fsl,ep8248e-mdio-bitbang";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -76,13 +75,11 @@
                                PHY0: ethernet-phy@0 {
                                        interrupt-parent = <&PIC>;
                                        reg = <0>;
-                                       device_type = "ethernet-phy";
                                };
 
                                PHY1: ethernet-phy@1 {
                                        interrupt-parent = <&PIC>;
                                        reg = <1>;
-                                       device_type = "ethernet-phy";
                                };
                        };
                };
@@ -121,8 +118,7 @@
 
                                data@0 {
                                        compatible = "fsl,cpm-muram-data";
-                                       reg = <0 0x1100 0x1140
-                                              0xec0 0x9800 0x800>;
+                                       reg = <0 0x2000 0x9800 0x800>;
                                };
                        };
 
@@ -138,7 +134,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>;