ARM: dts: nxp: Fix some common switch mistakes

Fix some errors in the Marvell MV88E6xxx switch descriptions:
- switch0@0 is not OK, should be ethernet-switch@0
- ports should be ethernet-ports
- port should be ethernet-port
- phy should be ethernet-phy

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/arm/boot/dts/nxp/vf/vf610-zii-cfu1.dts b/arch/arm/boot/dts/nxp/vf/vf610-zii-cfu1.dts
index 1a19aec8957b744e4254931e8527d9829b5a70ac..7e72f860c3c5165d7d18f1f891f08d14f8c482d1 100644 (file)
--- a/arch/arm/boot/dts/nxp/vf/vf610-zii-cfu1.dts
+++ b/arch/arm/boot/dts/nxp/vf/vf610-zii-cfu1.dts
@@ -162,7 +162,7 @@ mdio1: mdio {
                suppress-preamble;
                status = "okay";
 
-               switch0: switch0@0 {
+               switch0: ethernet-switch@0 {
                        compatible = "marvell,mv88e6085";
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_switch>;
@@ -173,26 +173,26 @@ switch0: switch0@0 {
                        interrupt-controller;
                        #interrupt-cells = <2>;
 
-                       ports {
+                       ethernet-ports {
                                #address-cells = <1>;
                                #size-cells = <0>;
 
-                               port@0 {
+                               ethernet-port@0 {
                                        reg = <0>;
                                        label = "eth_cu_1000_1";
                                };
 
-                               port@1 {
+                               ethernet-port@1 {
                                        reg = <1>;
                                        label = "eth_cu_1000_2";
                                };
 
-                               port@2 {
+                               ethernet-port@2 {
                                        reg = <2>;
                                        label = "eth_cu_1000_3";
                                };
 
-                               port@5 {
+                               ethernet-port@5 {
                                        reg = <5>;
                                        label = "eth_fc_1000_1";
                                        phy-mode = "1000base-x";
@@ -200,7 +200,7 @@ port@5 {
                                        sfp = <&sff>;
                                };
 
-                               port@6 {
+                               ethernet-port@6 {
                                        reg = <6>;
                                        phy-mode = "rmii";
                                        ethernet = <&fec1>;

diff --git a/arch/arm/boot/dts/nxp/vf/vf610-zii-scu4-aib.dts b/arch/arm/boot/dts/nxp/vf/vf610-zii-scu4-aib.dts
index df1335492a199841483dc9facd40834fab48003c..77492eeea4509bf2bc05ac48a57836076e604cbd 100644 (file)
--- a/arch/arm/boot/dts/nxp/vf/vf610-zii-scu4-aib.dts
+++ b/arch/arm/boot/dts/nxp/vf/vf610-zii-scu4-aib.dts
@@ -47,17 +47,17 @@ mdio_mux_1: mdio@1 {
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       switch0: switch0@0 {
+                       switch0: ethernet-switch@0 {
                                compatible = "marvell,mv88e6190";
                                reg = <0>;
                                dsa,member = <0 0>;
                                eeprom-length = <65536>;
 
-                               ports {
+                               ethernet-ports {
                                        #address-cells = <1>;
                                        #size-cells = <0>;
 
-                                       port@0 {
+                                       ethernet-port@0 {
                                                reg = <0>;
                                                phy-mode = "rmii";
                                                ethernet = <&fec1>;
@@ -68,37 +68,37 @@ fixed-link {
                                                };
                                        };
 
-                                       port@1 {
+                                       ethernet-port@1 {
                                                reg = <1>;
                                                label = "aib2main_1";
                                        };
 
-                                       port@2 {
+                                       ethernet-port@2 {
                                                reg = <2>;
                                                label = "aib2main_2";
                                        };
 
-                                       port@3 {
+                                       ethernet-port@3 {
                                                reg = <3>;
                                                label = "eth_cu_1000_5";
                                        };
 
-                                       port@4 {
+                                       ethernet-port@4 {
                                                reg = <4>;
                                                label = "eth_cu_1000_6";
                                        };
 
-                                       port@5 {
+                                       ethernet-port@5 {
                                                reg = <5>;
                                                label = "eth_cu_1000_4";
                                        };
 
-                                       port@6 {
+                                       ethernet-port@6 {
                                                reg = <6>;
                                                label = "eth_cu_1000_7";
                                        };
 
-                                       port@7 {
+                                       ethernet-port@7 {
                                                reg = <7>;
                                                label = "modem_pic";
 
@@ -108,7 +108,7 @@ fixed-link {
                                                };
                                        };
 
-                                       switch0port10: port@10 {
+                                       switch0port10: ethernet-port@10 {
                                                reg = <10>;
                                                label = "dsa";
                                                phy-mode = "xgmii";
@@ -130,32 +130,32 @@ mdio_mux_2: mdio@2 {
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       switch1: switch1@0 {
+                       switch1: ethernet-switch@0 {
                                compatible = "marvell,mv88e6190";
                                reg = <0>;
                                dsa,member = <0 1>;
                                eeprom-length = <65536>;
 
-                               ports {
+                               ethernet-ports {
                                        #address-cells = <1>;
                                        #size-cells = <0>;
 
-                                       port@1 {
+                                       ethernet-port@1 {
                                                reg = <1>;
                                                label = "eth_cu_1000_3";
                                        };
 
-                                       port@2 {
+                                       ethernet-port@2 {
                                                reg = <2>;
                                                label = "eth_cu_100_2";
                                        };
 
-                                       port@3 {
+                                       ethernet-port@3 {
                                                reg = <3>;
                                                label = "eth_cu_100_3";
                                        };
 
-                                       switch1port9: port@9 {
+                                       switch1port9: ethernet-port@9 {
                                                reg = <9>;
                                                label = "dsa";
                                                phy-mode = "xgmii";
@@ -168,7 +168,7 @@ fixed-link {
                                                };
                                        };
 
-                                       switch1port10: port@10 {
+                                       switch1port10: ethernet-port@10 {
                                                reg = <10>;
                                                label = "dsa";
                                                phy-mode = "xgmii";
@@ -188,17 +188,17 @@ mdio_mux_4: mdio@4 {
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       switch2: switch2@0 {
+                       switch2: ethernet-switch@0 {
                                compatible = "marvell,mv88e6190";
                                reg = <0>;
                                dsa,member = <0 2>;
                                eeprom-length = <65536>;
 
-                               ports {
+                               ethernet-ports {
                                        #address-cells = <1>;
                                        #size-cells = <0>;
 
-                                       port@2 {
+                                       ethernet-port@2 {
                                                reg = <2>;
                                                label = "eth_fc_1000_2";
                                                phy-mode = "1000base-x";
@@ -206,7 +206,7 @@ port@2 {
                                                sfp = <&sff1>;
                                        };
 
-                                       port@3 {
+                                       ethernet-port@3 {
                                                reg = <3>;
                                                label = "eth_fc_1000_3";
                                                phy-mode = "1000base-x";
@@ -214,7 +214,7 @@ port@3 {
                                                sfp = <&sff2>;
                                        };
 
-                                       port@4 {
+                                       ethernet-port@4 {
                                                reg = <4>;
                                                label = "eth_fc_1000_4";
                                                phy-mode = "1000base-x";
@@ -222,7 +222,7 @@ port@4 {
                                                sfp = <&sff3>;
                                        };
 
-                                       port@5 {
+                                       ethernet-port@5 {
                                                reg = <5>;
                                                label = "eth_fc_1000_5";
                                                phy-mode = "1000base-x";
@@ -230,7 +230,7 @@ port@5 {
                                                sfp = <&sff4>;
                                        };
 
-                                       port@6 {
+                                       ethernet-port@6 {
                                                reg = <6>;
                                                label = "eth_fc_1000_6";
                                                phy-mode = "1000base-x";
@@ -238,7 +238,7 @@ port@6 {
                                                sfp = <&sff5>;
                                        };
 
-                                       port@7 {
+                                       ethernet-port@7 {
                                                reg = <7>;
                                                label = "eth_fc_1000_7";
                                                phy-mode = "1000base-x";
@@ -246,7 +246,7 @@ port@7 {
                                                sfp = <&sff6>;
                                        };
 
-                                       port@9 {
+                                       ethernet-port@9 {
                                                reg = <9>;
                                                label = "eth_fc_1000_1";
                                                phy-mode = "1000base-x";
@@ -254,7 +254,7 @@ port@9 {
                                                sfp = <&sff0>;
                                        };
 
-                                       switch2port10: port@10 {
+                                       switch2port10: ethernet-port@10 {
                                                reg = <10>;
                                                label = "dsa";
                                                phy-mode = "2500base-x";
@@ -276,17 +276,17 @@ mdio_mux_8: mdio@8 {
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       switch3: switch3@0 {
+                       switch3: ethernet-switch@0 {
                                compatible = "marvell,mv88e6190";
                                reg = <0>;
                                dsa,member = <0 3>;
                                eeprom-length = <65536>;
 
-                               ports {
+                               ethernet-ports {
                                        #address-cells = <1>;
                                        #size-cells = <0>;
 
-                                       port@2 {
+                                       ethernet-port@2 {
                                                reg = <2>;
                                                label = "eth_fc_1000_8";
                                                phy-mode = "1000base-x";
@@ -294,7 +294,7 @@ port@2 {
                                                sfp = <&sff7>;
                                        };
 
-                                       port@3 {
+                                       ethernet-port@3 {
                                                reg = <3>;
                                                label = "eth_fc_1000_9";
                                                phy-mode = "1000base-x";
@@ -302,7 +302,7 @@ port@3 {
                                                sfp = <&sff8>;
                                        };
 
-                                       port@4 {
+                                       ethernet-port@4 {
                                                reg = <4>;
                                                label = "eth_fc_1000_10";
                                                phy-mode = "1000base-x";
@@ -310,7 +310,7 @@ port@4 {
                                                sfp = <&sff9>;
                                        };
 
-                                       switch3port9: port@9 {
+                                       switch3port9: ethernet-port@9 {
                                                reg = <9>;
                                                label = "dsa";
                                                phy-mode = "2500base-x";
@@ -322,7 +322,7 @@ fixed-link {
                                                };
                                        };
 
-                                       switch3port10: port@10 {
+                                       switch3port10: ethernet-port@10 {
                                                reg = <10>;
                                                label = "dsa";
                                                phy-mode = "xgmii";

diff --git a/arch/arm/boot/dts/nxp/vf/vf610-zii-spb4.dts b/arch/arm/boot/dts/nxp/vf/vf610-zii-spb4.dts
index 1461804ecaea3b74bf438663b82663aa8b087104..2a490464660c08d2d998c280c96e6ddd1245972c 100644 (file)
--- a/arch/arm/boot/dts/nxp/vf/vf610-zii-spb4.dts
+++ b/arch/arm/boot/dts/nxp/vf/vf610-zii-spb4.dts
@@ -123,7 +123,7 @@ mdio1: mdio {
                suppress-preamble;
                status = "okay";
 
-               switch0: switch0@0 {
+               switch0: ethernet-switch@0 {
                        compatible = "marvell,mv88e6190";
                        pinctrl-0 = <&pinctrl_gpio_switch0>;
                        pinctrl-names = "default";
@@ -134,11 +134,11 @@ switch0: switch0@0 {
                        interrupt-controller;
                        #interrupt-cells = <2>;
 
-                       ports {
+                       ethernet-ports {
                                #address-cells = <1>;
                                #size-cells = <0>;
 
-                               port@0 {
+                               ethernet-port@0 {
                                        reg = <0>;
                                        phy-mode = "rmii";
                                        ethernet = <&fec1>;
@@ -149,32 +149,32 @@ fixed-link {
                                        };
                                };
 
-                               port@1 {
+                               ethernet-port@1 {
                                        reg = <1>;
                                        label = "eth_cu_1000_1";
                                };
 
-                               port@2 {
+                               ethernet-port@2 {
                                        reg = <2>;
                                        label = "eth_cu_1000_2";
                                };
 
-                               port@3 {
+                               ethernet-port@3 {
                                        reg = <3>;
                                        label = "eth_cu_1000_3";
                                };
 
-                               port@4 {
+                               ethernet-port@4 {
                                        reg = <4>;
                                        label = "eth_cu_1000_4";
                                };
 
-                               port@5 {
+                               ethernet-port@5 {
                                        reg = <5>;
                                        label = "eth_cu_1000_5";
                                };
 
-                               port@6 {
+                               ethernet-port@6 {
                                        reg = <6>;
                                        label = "eth_cu_1000_6";
                                };

diff --git a/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-dtu.dts b/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-dtu.dts
index 463c2452b9b7f9e6ee02b0a8dcb90b415d64a171..078d8699e16d70121e9763502759ba250ac02104 100644 (file)
--- a/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-dtu.dts
+++ b/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-dtu.dts
@@ -112,7 +112,7 @@ mdio1: mdio {
                suppress-preamble;
                status = "okay";
 
-               switch0: switch0@0 {
+               switch0: ethernet-switch@0 {
                        compatible = "marvell,mv88e6190";
                        pinctrl-0 = <&pinctrl_gpio_switch0>;
                        pinctrl-names = "default";
@@ -123,11 +123,11 @@ switch0: switch0@0 {
                        interrupt-controller;
                        #interrupt-cells = <2>;
 
-                       ports {
+                       ethernet-ports {
                                #address-cells = <1>;
                                #size-cells = <0>;
 
-                               port@0 {
+                               ethernet-port@0 {
                                        reg = <0>;
                                        phy-mode = "rmii";
                                        ethernet = <&fec1>;
@@ -138,27 +138,27 @@ fixed-link {
                                        };
                                };
 
-                               port@1 {
+                               ethernet-port@1 {
                                        reg = <1>;
                                        label = "eth_cu_100_3";
                                };
 
-                               port@5 {
+                               ethernet-port@5 {
                                        reg = <5>;
                                        label = "eth_cu_1000_4";
                                };
 
-                               port@6 {
+                               ethernet-port@6 {
                                        reg = <6>;
                                        label = "eth_cu_1000_5";
                                };
 
-                               port@8 {
+                               ethernet-port@8 {
                                        reg = <8>;
                                        label = "eth_cu_1000_1";
                                };
 
-                               port@9 {
+                               ethernet-port@9 {
                                        reg = <9>;
                                        label = "eth_cu_1000_2";
                                        phy-handle = <&phy9>;
@@ -167,12 +167,12 @@ port@9 {
                                };
                        };
 
-                       mdio1 {
+                       mdio-external {
                                compatible = "marvell,mv88e6xxx-mdio-external";
                                #address-cells = <1>;
                                #size-cells = <0>;
 
-                               phy9: phy9@0 {
+                               phy9: ethernet-phy@0 {
                                        compatible = "ethernet-phy-ieee802.3-c45";
                                        pinctrl-0 = <&pinctrl_gpio_phy9>;
                                        pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-spu3.dts b/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-spu3.dts
index f5ae0d5de31517374a5223518a8de924df1eaa03..22c8f44390a96d3b2c3abd9905ec229323c9529f 100644 (file)
--- a/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-spu3.dts
+++ b/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-spu3.dts
@@ -137,7 +137,7 @@ mdio1: mdio {
                suppress-preamble;
                status = "okay";
 
-               switch0: switch0@0 {
+               switch0: ethernet-switch@0 {
                        compatible = "marvell,mv88e6190";
                        pinctrl-0 = <&pinctrl_gpio_switch0>;
                        pinctrl-names = "default";
@@ -148,11 +148,11 @@ switch0: switch0@0 {
                        interrupt-controller;
                        #interrupt-cells = <2>;
 
-                       ports {
+                       ethernet-ports {
                                #address-cells = <1>;
                                #size-cells = <0>;
 
-                               port@0 {
+                               ethernet-port@0 {
                                        reg = <0>;
                                        phy-mode = "rmii";
                                        ethernet = <&fec1>;
@@ -163,32 +163,32 @@ fixed-link {
                                        };
                                };
 
-                               port@1 {
+                               ethernet-port@1 {
                                        reg = <1>;
                                        label = "eth_cu_1000_1";
                                };
 
-                               port@2 {
+                               ethernet-port@2 {
                                        reg = <2>;
                                        label = "eth_cu_1000_2";
                                };
 
-                               port@3 {
+                               ethernet-port@3 {
                                        reg = <3>;
                                        label = "eth_cu_1000_3";
                                };
 
-                               port@4 {
+                               ethernet-port@4 {
                                        reg = <4>;
                                        label = "eth_cu_1000_4";
                                };
 
-                               port@5 {
+                               ethernet-port@5 {
                                        reg = <5>;
                                        label = "eth_cu_1000_5";
                                };
 
-                               port@6 {
+                               ethernet-port@6 {
                                        reg = <6>;
                                        label = "eth_cu_1000_6";
                                };