10 files changed, 81 insertions, 69 deletions

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index b8c5cd3ddeb9..e6aa6e77a3ec 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -144,8 +144,8 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += kirkwood-b3.dtb \
         kirkwood-openrd-client.dtb \
         kirkwood-openrd-ultimate.dtb \
         kirkwood-rd88f6192.dtb \
-        kirkwood-rd88f6281-a0.dtb \
-        kirkwood-rd88f6281-a1.dtb \
+        kirkwood-rd88f6281-z0.dtb \
+        kirkwood-rd88f6281-a.dtb \
         kirkwood-rs212.dtb \
         kirkwood-rs409.dtb \
         kirkwood-rs411.dtb \
diff --git a/arch/arm/boot/dts/armada-370-netgear-rn102.dts b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
index d6d572e5af32..285524fb915e 100644
--- a/arch/arm/boot/dts/armada-370-netgear-rn102.dts
+++ b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
@@ -143,6 +143,10 @@
                                 marvell,nand-enable-arbiter;
                                 nand-on-flash-bbt;
 
+                                /* Use Hardware BCH ECC */
+                                nand-ecc-strength = <4>;
+                                nand-ecc-step-size = <512>;
+
                                 partition@0 {
                                         label = "u-boot";
                                         reg = <0x0000000 0x180000>;  /* 1.5MB */
diff --git a/arch/arm/boot/dts/armada-370-netgear-rn104.dts b/arch/arm/boot/dts/armada-370-netgear-rn104.dts
index c5fe8b5dcdc7..4ec1ce561d34 100644
--- a/arch/arm/boot/dts/armada-370-netgear-rn104.dts
+++ b/arch/arm/boot/dts/armada-370-netgear-rn104.dts
@@ -145,6 +145,10 @@
                                 marvell,nand-enable-arbiter;
                                 nand-on-flash-bbt;
 
+                                /* Use Hardware BCH ECC */
+                                nand-ecc-strength = <4>;
+                                nand-ecc-step-size = <512>;
+
                                 partition@0 {
                                         label = "u-boot";
                                         reg = <0x0000000 0x180000>;  /* 1.5MB */
diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
index 0cf999abc4ed..c5ed85a70ed9 100644
--- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
+++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
@@ -223,6 +223,10 @@
                                 marvell,nand-enable-arbiter;
                                 nand-on-flash-bbt;
 
+                                /* Use Hardware BCH ECC */
+                                nand-ecc-strength = <4>;
+                                nand-ecc-step-size = <512>;
+
                                 partition@0 {
                                         label = "u-boot";
                                         reg = <0x0000000 0x180000>;  /* 1.5MB */
diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
index 8f76d28759a3..f82827d6fcff 100644
--- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
+++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
@@ -123,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>;
@@ -169,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>;
         };
 };
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281-a.dts b/arch/arm/boot/dts/kirkwood-rd88f6281-a.dts
new file mode 100644
index 000000000000..f2e08b3b33ea
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-rd88f6281-a.dts
@@ -0,0 +1,43 @@
+/*
+ * Marvell RD88F6181 A Board descrition
+ *
+ * Andrew Lunn <andrew@lunn.ch>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ *
+ * This file contains the definitions for the board with the A0 or
+ * higher stepping of the SoC. The ethernet switch does not have a
+ * "wan" port.
+ */
+
+/dts-v1/;
+#include "kirkwood-rd88f6281.dtsi"
+
+/ {
+        model = "Marvell RD88f6281 Reference design, with A0 or higher SoC";
+        compatible = "marvell,rd88f6281-a", "marvell,rd88f6281","marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+        dsa@0 {
+                switch@0 {
+                        reg = <10 0>;    /* MDIO address 10, switch 0 in tree */
+                };
+        };
+};
+
+&mdio {
+        status = "okay";
+
+        ethphy1: ethernet-phy@11 {
+                 reg = <11>;
+        };
+};
+
+&eth1 {
+        status = "okay";
+
+        ethernet1-port@0 {
+                 phy-handle = <&ethphy1>;
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281-a0.dts b/arch/arm/boot/dts/kirkwood-rd88f6281-a0.dts
deleted file mode 100644
index a803bbb70bc8..000000000000
--- a/arch/arm/boot/dts/kirkwood-rd88f6281-a0.dts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Marvell RD88F6181 A0 Board descrition
- *
- * Andrew Lunn <andrew@lunn.ch>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- *
- * This file contains the definitions for the board with the A0 variant of
- * the SoC. The ethernet switch does not have a "wan" port.
- */
-
-/dts-v1/;
-#include "kirkwood-rd88f6281.dtsi"
-
-/ {
-        model = "Marvell RD88f6281 Reference design, with A0 SoC";
-        compatible = "marvell,rd88f6281-a0", "marvell,rd88f6281","marvell,kirkwood-88f6281", "marvell,kirkwood";
-
-        dsa@0 {
-                switch@0 {
-                        reg = <10 0>;    /* MDIO address 10, switch 0 in tree */
-                };
-        };
-};
\ No newline at end of file
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281-a1.dts b/arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts
index baeebbf1d8c7..f4272b64ed7f 100644
--- a/arch/arm/boot/dts/kirkwood-rd88f6281-a1.dts
+++ b/arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts
@@ -1,5 +1,5 @@
 /*
- * Marvell RD88F6181 A1 Board descrition
+ * Marvell RD88F6181 Z0 stepping descrition
  *
  * Andrew Lunn <andrew@lunn.ch>
  *
@@ -7,17 +7,17 @@
  * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  *
- * This file contains the definitions for the board with the A1 variant of
- * the SoC. The ethernet switch has a "wan" port.
- */
+ * This file contains the definitions for the board using the Z0
+ * stepping of the SoC. The ethernet switch has a "wan" port.
+*/
 
 /dts-v1/;
 
 #include "kirkwood-rd88f6281.dtsi"
 
 / {
-        model = "Marvell RD88f6281 Reference design, with A1 SoC";
-        compatible = "marvell,rd88f6281-a1", "marvell,rd88f6281","marvell,kirkwood-88f6281", "marvell,kirkwood";
+        model = "Marvell RD88f6281 Reference design, with Z0 SoC";
+        compatible = "marvell,rd88f6281-z0", "marvell,rd88f6281","marvell,kirkwood-88f6281", "marvell,kirkwood";
 
         dsa@0 {
                 switch@0 {
@@ -28,4 +28,8 @@
                         };
                 };
         };
-};
\ No newline at end of file
+};
+
+&eth1 {
+      status = "disabled";
+};
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>;
         };
 };
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index afc640cd80c5..464f09a1a4a5 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -309,7 +309,7 @@
                         marvell,tx-checksum-limit = <1600>;
                         status = "disabled";
 
-                        ethernet0-port@0 {
+                        eth0port: ethernet0-port@0 {
                                 compatible = "marvell,kirkwood-eth-port";
                                 reg = <0>;
                                 interrupts = <11>;
@@ -342,7 +342,7 @@
                         pinctrl-names = "default";
                         status = "disabled";
 
-                        ethernet1-port@0 {
+                        eth1port: ethernet1-port@0 {
                                 compatible = "marvell,kirkwood-eth-port";
                                 reg = <0>;
                                 interrupts = <15>;