Merge branch 'master' into next

[platform/kernel/u-boot.git] / arch / m68k / dts / stmark2.dts

diff --git a/arch/m68k/dts/stmark2.dts b/arch/m68k/dts/stmark2.dts
index fd8ce4f..ebe8580 100644 (file)
--- a/arch/m68k/dts/stmark2.dts
+++ b/arch/m68k/dts/stmark2.dts
@@ -16,7 +16,7 @@
 };
 
 &uart0 {
-       u-boot,dm-pre-reloc;
+       bootph-all;
        status = "okay";
 };
 
@@ -27,8 +27,17 @@
        flash: is25lp128@1 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <60000000>;
                reg = <1>;
        };
 };
+
+&fec0 {
+       status = "okay";
+};
+
+&fec1 {
+       status = "okay";
+       mii-base = <0>;
+};