Merge tag 'mvebu-fixes-3.17' of git://git.infradead.org/linux-mvebu into next/fixes...

[cascardo/linux.git] / arch / arm / boot / dts / kirkwood-mv88f6281gtw-ge.dts

diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
index 32c6fb4..f82827d 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
+++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
@@ -28,10 +28,21 @@
 
        chosen {
                bootargs = "console=ttyS0,115200n8 earlyprintk";
+               stdout-path = &uart0;
        };
 
+       mbus {
+               pcie-controller {
+                       status = "okay";
+
+                       pcie@1,0 {
+                               status = "okay";
+                       };
+               };
+        };
+
        ocp@f1000000 {
-               pinctrl@10000 {
+               pin-controller@10000 {
                        pmx_usb_led: pmx-usb-led {
                                marvell,pins = "mpp12";
                                marvell,function = "gpo";
@@ -49,8 +60,6 @@
                };
 
                spi@10600 {
-                       pinctrl-0 = <&pmx_spi>;
-                       pinctrl-names = "default";
                        status = "okay";
 
                        flash@0 {
@@ -64,23 +73,12 @@
                };
 
                serial@12000 {
-                       pinctrl-0 = <&pmx_uart0>;
-                       pinctrl-names = "default";
-                       clock-frequency = <200000000>;
-                       status = "ok";
+                       status = "okay";
                };
 
                ehci@50000 {
                        status = "okay";
                };
-
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
        };
 
        gpio-leds {
@@ -125,11 +123,11 @@
 
        dsa@0 {
                compatible = "marvell,dsa";
-               #address-cells = <2>;
+               #address-cells = <1>;
                #size-cells = <0>;
 
-               dsa,ethernet = <&eth0>;
-               dsa,mii-bus = <&ethphy0>;
+               dsa,ethernet = <&eth0port>;
+               dsa,mii-bus = <&mdio>;
 
                switch@0 {
                        #address-cells = <1>;
@@ -171,17 +169,13 @@
 
 &mdio {
        status = "okay";
-
-       ethphy0: ethernet-phy@ff {
-               reg = <0xff>;   /* No phy attached */
-               speed = <1000>;
-               duplex = <1>;
-       };
 };
 
 &eth0 {
        status = "okay";
+
        ethernet0-port@0 {
-               phy-handle = <&ethphy0>;
+               speed = <1000>;
+               duplex = <1>;
        };
 };