ARM: Kirkwood: Fix DT based DSA.

During the conversion of boards to use DT to instantiate Distributed
Switch Architecture, nobody volunteered to test. As to be expected,
the conversion was flawed. Testers and access to hardware has now
become available, and this patch hopefully fixes the problems.

dsa,mii-bus must be a phandle to the top level mdio node, not the port
specific subnode of the mdio device.

dsa,ethernet must be a phandle to the port subnode within the ethernet
DT node, not the ethernet node.

Don't pinctrl hog the card detect gpio for mvsdio.

Rename the .dts files to make it clearer which file is for the Z0
stepping and which for the A0 or later stepping.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Cc: seugene@marvell.com
Tested-by: Eugene Sanivsky <seugene@marvell.com>
Fixes: e2eaa339af44: ("ARM: Kirkwood: convert rd88f6281-setup.c to DT.")
Fixes: e7c8f3808be8: ("ARM: kirkwood: Convert mv88f6281gtw_ge switch setup to DT")
Cc: <stable@vger.kernel.org> #v3.15+
Link: https://lkml.kernel.org/r/1409592941-22244-1-git-send-email-andrew@lunn.ch
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

1 files changed, 5 insertions, 22 deletions

diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
index 26cf0e0ccefd..d195e884b3b5 100644
--- a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
+++ b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
@@ -37,7 +37,6 @@
 
         ocp@f1000000 {
                 pinctrl: pin-controller@10000 {
-                        pinctrl-0 = <&pmx_sdio_cd>;
                         pinctrl-names = "default";
 
                         pmx_sdio_cd: pmx-sdio-cd {
@@ -69,8 +68,8 @@
                 #address-cells = <2>;
                 #size-cells = <0>;
 
-                dsa,ethernet = <&eth0>;
-                dsa,mii-bus = <&ethphy1>;
+                dsa,ethernet = <&eth0port>;
+                dsa,mii-bus = <&mdio>;
 
                 switch@0 {
                         #address-cells = <1>;
@@ -119,35 +118,19 @@
         };
 
         partition@300000 {
-                label = "data";
+                label = "rootfs";
                 reg = <0x0300000 0x500000>;
         };
 };
 
 &mdio {
         status = "okay";
-
-        ethphy0: ethernet-phy@0 {
-                reg = <0>;
-        };
-
-        ethphy1: ethernet-phy@ff {
-                reg = <0xff>; /* No PHY attached */
-                speed = <1000>;
-                duple = <1>;
-        };
 };
 
 &eth0 {
         status = "okay";
         ethernet0-port@0 {
-                phy-handle = <&ethphy0>;
-        };
-};
-
-&eth1 {
-        status = "okay";
-        ethernet1-port@0 {
-                phy-handle = <&ethphy1>;
+                speed = <1000>;
+                duplex = <1>;
         };
 };