Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / armada-370-netgear-rn102.dts

diff --git a/arch/arm/boot/dts/armada-370-netgear-rn102.dts b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
index d6d572e5af321482b20aa1fd08baed1f445a37eb..3aebd93cc33c864538475216b8f51fb9e49b4ce7 100644 (file)
--- a/arch/arm/boot/dts/armada-370-netgear-rn102.dts
+++ b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
@@ -101,12 +101,16 @@
                        };
 
                        mdio {
+                               pinctrl-0 = <&mdio_pins>;
+                               pinctrl-names = "default";
                                phy0: ethernet-phy@0 { /* Marvell 88E1318 */
                                        reg = <0>;
                                };
                        };
 
                        ethernet@74000 {
+                               pinctrl-0 = <&ge1_rgmii_pins>;
+                               pinctrl-names = "default";
                                status = "okay";
                                phy = <&phy0>;
                                phy-mode = "rgmii-id";
@@ -122,7 +126,7 @@
                                status = "okay";
 
                                isl12057: isl12057@68 {
-                                       compatible = "isl,isl12057";
+                                       compatible = "isil,isl12057";
                                        reg = <0x68>;
                                };
 
@@ -143,6 +147,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 */