ARM: dts: armada-370-xp: Fixup mdio DT warning

MDIO has a reg property so the unit name should contain an address.
Take the opportunity to use the node label instead of the full name.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts
index 033fa63544f7932e543dd7dc3aaa26694e0f2673..d26115085ea1a093a2a9f0e04991915fba2b0201 100644 (file)
--- a/arch/arm/boot/dts/armada-370-db.dts
+++ b/arch/arm/boot/dts/armada-370-db.dts
@@ -86,18 +86,6 @@ sata@a0000 {
                                status = "okay";
                        };
 
-                       mdio {
-                               pinctrl-0 = <&mdio_pins>;
-                               pinctrl-names = "default";
-                               phy0: ethernet-phy@0 {
-                                       reg = <0>;
-                               };
-
-                               phy1: ethernet-phy@1 {
-                                       reg = <1>;
-                               };
-                       };
-
                        ethernet@70000 {
                                pinctrl-0 = <&ge0_rgmii_pins>;
                                pinctrl-names = "default";
@@ -260,6 +248,18 @@ spdif_in: spdif-in {
                compatible = "linux,spdif-dir";
        };
 };
+&mdio {
+       pinctrl-0 = <&mdio_pins>;
+       pinctrl-names = "default";
+       phy0: ethernet-phy@0 {
+               reg = <0>;
+       };
+
+       phy1: ethernet-phy@1 {
+               reg = <1>;
+       };
+};
+
 
 &spi0 {
        pinctrl-0 = <&spi0_pins2>;

diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts
index d5e19cd4d256bc1e8fd51b21201ca576278ee782..3e1ef56b6319a6f91975fba7b465c178c2bb28d3 100644 (file)
--- a/arch/arm/boot/dts/armada-370-mirabox.dts
+++ b/arch/arm/boot/dts/armada-370-mirabox.dts
@@ -113,17 +113,6 @@ green_stat_led {
                                };
                        };
 
-                       mdio {
-                               pinctrl-0 = <&mdio_pins>;
-                               pinctrl-names = "default";
-                               phy0: ethernet-phy@0 {
-                                       reg = <0>;
-                               };
-
-                               phy1: ethernet-phy@1 {
-                                       reg = <1>;
-                               };
-                       };
                        ethernet@70000 {
                                pinctrl-0 = <&ge0_rgmii_pins>;
                                pinctrl-names = "default";
@@ -197,6 +186,18 @@ partition@800000 {
        };
 };
 
+&mdio {
+       pinctrl-0 = <&mdio_pins>;
+       pinctrl-names = "default";
+       phy0: ethernet-phy@0 {
+               reg = <0>;
+       };
+
+       phy1: ethernet-phy@1 {
+               reg = <1>;
+       };
+};
+
 &pinctrl {
        pwr_led_pin: pwr-led-pin {
                marvell,pins = "mpp63";

diff --git a/arch/arm/boot/dts/armada-370-netgear-rn102.dts b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
index a9e3810aea65de06056bb67ed7b77beb43169184..a6409853db6d7577c02d9d48cc4a738cccefa6f1 100644 (file)
--- a/arch/arm/boot/dts/armada-370-netgear-rn102.dts
+++ b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
@@ -99,14 +99,6 @@ sata@a0000 {
                                status = "okay";
                        };
 
-                       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";
@@ -260,6 +252,14 @@ gpio-poweroff {
        };
 };
 
+&mdio {
+       pinctrl-0 = <&mdio_pins>;
+       pinctrl-names = "default";
+       phy0: ethernet-phy@0 { /* Marvell 88E1318 */
+               reg = <0>;
+       };
+};
+
 &pinctrl {
        power_led_pin: power-led-pin {
                marvell,pins = "mpp57";

diff --git a/arch/arm/boot/dts/armada-370-netgear-rn104.dts b/arch/arm/boot/dts/armada-370-netgear-rn104.dts
index 14c379699350427bc2627d9070b404c3c2157083..fd5f1d9a434aeff55fa55b11387e7f815f438470 100644 (file)
--- a/arch/arm/boot/dts/armada-370-netgear-rn104.dts
+++ b/arch/arm/boot/dts/armada-370-netgear-rn104.dts
@@ -93,18 +93,6 @@ serial@12000 {
                                status = "okay";
                        };
 
-                       mdio {
-                               pinctrl-0 = <&mdio_pins>;
-                               pinctrl-names = "default";
-                               phy0: ethernet-phy@0 { /* Marvell 88E1318 */
-                                       reg = <0>;
-                               };
-
-                               phy1: ethernet-phy@1 { /* Marvell 88E1318 */
-                                       reg = <1>;
-                               };
-                       };
-
                        ethernet@70000 {
                                pinctrl-0 = <&ge0_rgmii_pins>;
                                pinctrl-names = "default";
@@ -282,6 +270,18 @@ gpio-poweroff {
        };
 };
 
+&mdio {
+       pinctrl-0 = <&mdio_pins>;
+       pinctrl-names = "default";
+       phy0: ethernet-phy@0 { /* Marvell 88E1318 */
+               reg = <0>;
+       };
+
+       phy1: ethernet-phy@1 { /* Marvell 88E1318 */
+               reg = <1>;
+       };
+};
+
 &pinctrl {
        poweroff: poweroff {
                marvell,pins = "mpp60";

diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
index fbef730e8d379df92d735c2e98fbaf2af0851cc9..621add7e12d5cc4dcc5c807bed52b4b623f92b88 100644 (file)
--- a/arch/arm/boot/dts/armada-370-rd.dts
+++ b/arch/arm/boot/dts/armada-370-rd.dts
@@ -102,14 +102,6 @@ sata@a0000 {
                                status = "okay";
                        };
 
-                       mdio {
-                               pinctrl-0 = <&mdio_pins>;
-                               pinctrl-names = "default";
-                               phy0: ethernet-phy@0 {
-                                       reg = <0>;
-                               };
-                       };
-
                        ethernet@70000 {
                                status = "okay";
                                phy = <&phy0>;
@@ -235,7 +227,16 @@ port@5 {
                        };
                };
         };
- };
+};
+
+&mdio {
+       pinctrl-0 = <&mdio_pins>;
+       pinctrl-names = "default";
+       phy0: ethernet-phy@0 {
+               reg = <0>;
+       };
+};
+
 
 &pinctrl {
        fan_pins: fan-pins {

diff --git a/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts b/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts
index ae2e1fe50ef64af3277be7a941ee1cac8a610acc..82ce5ec6467b37ffa17c770f9f8ca5f5002fb243 100644 (file)
--- a/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts
+++ b/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts
@@ -36,12 +36,6 @@ pcie@1,0 {
                };
 
                internal-regs {
-                       mdio {
-                               phy1: ethernet-phy@1 {
-                                       reg = <1>;
-                               };
-                       };
-
                        ethernet@74000 {
                                status = "okay";
                                pinctrl-0 = <&ge1_rgmii_pins>;
@@ -131,3 +125,10 @@ gpio-fan {
                          1300 0>;
        };
 };
+
+&mdio {
+       phy1: ethernet-phy@1 {
+               reg = <1>;
+       };
+};
+

diff --git a/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi b/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
index 3036e25c5992a817e7ca2c8483c9e5a29bb91ce7..724a47908e3f6e259d32588dd3c44d42046c0c6e 100644 (file)
--- a/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
+++ b/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
@@ -51,15 +51,6 @@ sata@a0000 {
                                status = "okay";
                        };
 
-                       mdio {
-                               pinctrl-0 = <&mdio_pins>;
-                               pinctrl-names = "default";
-
-                               phy0: ethernet-phy@0 {
-                                       reg = <0>;
-                               };
-                       };
-
                        ethernet@70000 {
                                status = "okay";
                                pinctrl-0 = <&ge0_rgmii_pins>;
@@ -208,6 +199,15 @@ gpio_poweroff {
        };
 };
 
+&mdio {
+       pinctrl-0 = <&mdio_pins>;
+       pinctrl-names = "default";
+
+       phy0: ethernet-phy@0 {
+               reg = <0>;
+       };
+};
+
 &pinctrl {
        pinctrl-0 = <&hdd0_led_sata_pin>, <&hdd1_led_sata_pin>;
        pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi b/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
index 01cded310cbc576a63252de2614763274fac9ef4..fb52a34f0a3501ab86ad420e18fc2344d2206349 100644 (file)
--- a/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
+++ b/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
@@ -51,15 +51,6 @@ serial@12000 {
                                status = "okay";
                        };
 
-                       mdio {
-                               pinctrl-0 = <&mdio_pins>;
-                               pinctrl-names = "default";
-
-                               phy0: ethernet-phy@0 {
-                                       reg = <0>;
-                               };
-                       };
-
                        ethernet@74000 {
                                status = "okay";
                                pinctrl-0 = <&ge1_rgmii_pins>;
@@ -143,6 +134,15 @@ gpio_poweroff {
        };
 };
 
+&mdio {
+       pinctrl-0 = <&mdio_pins>;
+       pinctrl-names = "default";
+
+       phy0: ethernet-phy@0 {
+               reg = <0>;
+       };
+};
+
 &pinctrl {
        pinctrl-0 = <&sata_led_pin>;
        pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/armada-370-synology-ds213j.dts b/arch/arm/boot/dts/armada-370-synology-ds213j.dts
index a9cc427768745cd39502aced36e36bc1448b143d..a696bbf0f703423d1d99403e39cce7032da249e7 100644 (file)
--- a/arch/arm/boot/dts/armada-370-synology-ds213j.dts
+++ b/arch/arm/boot/dts/armada-370-synology-ds213j.dts
@@ -127,12 +127,6 @@ usb@51000 {
                                status = "okay";
                        };
 
-                       mdio {
-                               phy1: ethernet-phy@1 { /* Marvell 88E1512 */
-                                       reg = <1>;
-                               };
-                       };
-
                        ethernet@70000 {
                               status = "okay";
                               phy = <&phy1>;
@@ -220,6 +214,12 @@ sata2_regulator: sata2-regulator {
        };
 };
 
+&mdio {
+       phy1: ethernet-phy@1 { /* Marvell 88E1512 */
+               reg = <1>;
+       };
+};
+
 &pinctrl {
        disk1_led_pin: disk1-led-pin {
                marvell,pins = "mpp31";

diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 54359896b76cbc77987cc844911c8f7260615699..a4f9684def1c64ad20304e9a837c891624fd3fcc 100644 (file)
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -259,7 +259,7 @@ eth0: ethernet@70000 {
                                status = "disabled";
                        };
 
-                       mdio: mdio {
+                       mdio: mdio@72004 {
                                #address-cells = <1>;
                                #size-cells = <0>;
                                compatible = "marvell,orion-mdio";

diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
index ce152719bc28fade6a34291f6525f5a4c69a6b02..7038c8625ac5b4149c759c1fc4a7a7197d615e4e 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts
+++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
@@ -111,16 +111,6 @@ sata@a0000 {
                                status = "okay";
                        };
 
-                       mdio {
-                               phy0: ethernet-phy@0 {
-                                       reg = <0>;
-                               };
-
-                               phy1: ethernet-phy@1 {
-                                       reg = <1>;
-                               };
-                       };
-
                        ethernet@70000 {
                                pinctrl-0 = <&ge0_rgmii_pins>;
                                pinctrl-names = "default";
@@ -153,6 +143,16 @@ button@1 {
        };
 };
 
+&mdio {
+       phy0: ethernet-phy@0 {
+               reg = <0>;
+       };
+
+       phy1: ethernet-phy@1 {
+               reg = <1>;
+       };
+};
+
 &pinctrl {
        pinctrl-0 = <&phy_int_pin>;
        pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts
index 075120bc3ec41cb40a06a23bf64e6deb9fd31609..665c81ff98dbc167b9c4d09bcb1e93717057128d 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-db.dts
+++ b/arch/arm/boot/dts/armada-xp-db.dts
@@ -160,24 +160,6 @@ sata@a0000 {
                                status = "okay";
                        };
 
-                       mdio {
-                               phy0: ethernet-phy@0 {
-                                       reg = <0>;
-                               };
-
-                               phy1: ethernet-phy@1 {
-                                       reg = <1>;
-                               };
-
-                               phy2: ethernet-phy@2 {
-                                       reg = <25>;
-                               };
-
-                               phy3: ethernet-phy@3 {
-                                       reg = <27>;
-                               };
-                       };
-
                        ethernet@70000 {
                                status = "okay";
                                phy = <&phy0>;
@@ -266,6 +248,24 @@ bm-bppi {
        };
 };
 
+&mdio {
+       phy0: ethernet-phy@0 {
+               reg = <0>;
+       };
+
+       phy1: ethernet-phy@1 {
+               reg = <1>;
+       };
+
+       phy2: ethernet-phy@2 {
+               reg = <25>;
+       };
+
+       phy3: ethernet-phy@3 {
+               reg = <27>;
+       };
+};
+
 &spi0 {
        status = "okay";
 

diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
index 190e4eccb180c7fae4691d6ab8362ce49957294f..09c9cabdf67a37ca03ff35d9e411caf58504141d 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-gp.dts
+++ b/arch/arm/boot/dts/armada-xp-gp.dts
@@ -175,24 +175,6 @@ sata@a0000 {
                                status = "okay";
                        };
 
-                       mdio {
-                               phy0: ethernet-phy@0 {
-                                       reg = <16>;
-                               };
-
-                               phy1: ethernet-phy@1 {
-                                       reg = <17>;
-                               };
-
-                               phy2: ethernet-phy@2 {
-                                       reg = <18>;
-                               };
-
-                               phy3: ethernet-phy@3 {
-                                       reg = <19>;
-                               };
-                       };
-
                        ethernet@70000 {
                                status = "okay";
                                phy = <&phy0>;
@@ -251,6 +233,24 @@ bm-bppi {
        };
 };
 
+&mdio {
+       phy0: ethernet-phy@0 {
+               reg = <16>;
+       };
+
+       phy1: ethernet-phy@1 {
+               reg = <17>;
+       };
+
+       phy2: ethernet-phy@2 {
+               reg = <18>;
+       };
+
+       phy3: ethernet-phy@3 {
+               reg = <19>;
+       };
+};
+
 &spi0 {
        status = "okay";
 

diff --git a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
index 8af463f26ea1e162360952dbc03c0a9bda807cd5..0a6a43692620777afb6a59db603b1a9a13b2b666 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
+++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
@@ -89,16 +89,6 @@ serial@12000 {
                                status = "okay";
                        };
 
-                       mdio {
-                               phy0: ethernet-phy@0 { /* Marvell 88E1318 */
-                                       reg = <0>;
-                               };
-
-                               phy1: ethernet-phy@1 { /* Marvell 88E1318 */
-                                       reg = <1>;
-                               };
-                       };
-
                        ethernet@70000 {
                                pinctrl-0 = <&ge0_rgmii_pins>;
                                pinctrl-names = "default";
@@ -296,6 +286,16 @@ gpio-poweroff {
        };
 };
 
+&mdio {
+       phy0: ethernet-phy@0 { /* Marvell 88E1318 */
+               reg = <0>;
+       };
+
+       phy1: ethernet-phy@1 { /* Marvell 88E1318 */
+               reg = <1>;
+       };
+};
+
 &pinctrl {
        poweroff_pin: poweroff-pin {
                marvell,pins = "mpp24";

diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
index b6bf5344fbbe36ad405385549611365e7a5ac409..c4685cb86f0675e6b079d55df845e92c682d3ca5 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
+++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
@@ -153,16 +153,6 @@ usb@50000 {
                                status = "okay";
                        };
 
-                       mdio {
-                               phy0: ethernet-phy@0 { /* Marvell 88E1318 */
-                                       reg = <0>;
-                               };
-
-                               phy1: ethernet-phy@1 { /* Marvell 88E1318 */
-                                       reg = <1>;
-                               };
-                       };
-
                        ethernet@70000 {
                                pinctrl-0 = <&ge0_rgmii_pins>;
                                pinctrl-names = "default";
@@ -300,6 +290,17 @@ gpio-poweroff {
        };
 };
 
+&mdio {
+       phy0: ethernet-phy@0 { /* Marvell 88E1318 */
+               reg = <0>;
+       };
+
+       phy1: ethernet-phy@1 { /* Marvell 88E1318 */
+               reg = <1>;
+       };
+};
+
+
 &pinctrl {
        poweroff: poweroff {
                marvell,pins = "mpp42";

diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
index ed3b889d16ce439a4e933cdcd17ff37ed6adc4c4..2e2cd935376171a1e2422ac37284e49351c8c5c0 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@ -155,24 +155,6 @@ button@1 {
                                };
                        };
 
-                       mdio {
-                               phy0: ethernet-phy@0 {
-                                       reg = <0>;
-                               };
-
-                               phy1: ethernet-phy@1 {
-                                       reg = <1>;
-                               };
-
-                               phy2: ethernet-phy@2 {
-                                       reg = <2>;
-                               };
-
-                               phy3: ethernet-phy@3 {
-                                       reg = <3>;
-                               };
-                       };
-
                        ethernet@70000 {
                                status = "okay";
                                phy = <&phy0>;
@@ -240,6 +222,24 @@ bm-bppi {
        };
 };
 
+&mdio {
+       phy0: ethernet-phy@0 {
+               reg = <0>;
+       };
+
+       phy1: ethernet-phy@1 {
+               reg = <1>;
+       };
+
+       phy2: ethernet-phy@2 {
+               reg = <2>;
+       };
+
+       phy3: ethernet-phy@3 {
+               reg = <3>;
+       };
+};
+
 &pinctrl {
        led_pins: led-pins-0 {
                marvell,pins = "mpp49", "mpp51", "mpp53";

diff --git a/arch/arm/boot/dts/armada-xp-synology-ds414.dts b/arch/arm/boot/dts/armada-xp-synology-ds414.dts
index ae286736b90a6dca87d238c6fc5b23803da66323..189ec7f4667cc16609a301f4ddf349bce4574204 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-synology-ds414.dts
+++ b/arch/arm/boot/dts/armada-xp-synology-ds414.dts
@@ -150,16 +150,6 @@ usb@50000 {
                                status = "okay";
                        };
 
-                       mdio {
-                               phy0: ethernet-phy@0 { /* Marvell 88E1512 */
-                                       reg = <0>;
-                               };
-
-                               phy1: ethernet-phy@1 { /* Marvell 88E1512 */
-                                       reg = <1>;
-                               };
-                       };
-
                        ethernet@70000 {
                                status = "okay";
                                pinctrl-0 = <&ge0_rgmii_pins>;
@@ -240,6 +230,16 @@ sata4_regulator: sata4-regulator {
        };
 };
 
+&mdio {
+       phy0: ethernet-phy@0 { /* Marvell 88E1512 */
+               reg = <0>;
+       };
+
+       phy1: ethernet-phy@1 { /* Marvell 88E1512 */
+               reg = <1>;
+       };
+};
+
 &pinctrl {
        sata1_pwr_pin: sata1-pwr-pin {
                marvell,pins = "mpp42";