Commit bfedd842 authored by Linus Walleij's avatar Linus Walleij Committed by David S. Miller

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: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2b83557a
...@@ -162,7 +162,7 @@ mdio1: mdio { ...@@ -162,7 +162,7 @@ mdio1: mdio {
suppress-preamble; suppress-preamble;
status = "okay"; status = "okay";
switch0: switch0@0 { switch0: ethernet-switch@0 {
compatible = "marvell,mv88e6085"; compatible = "marvell,mv88e6085";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_switch>; pinctrl-0 = <&pinctrl_switch>;
...@@ -173,26 +173,26 @@ switch0: switch0@0 { ...@@ -173,26 +173,26 @@ switch0: switch0@0 {
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
ports { ethernet-ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
port@0 { ethernet-port@0 {
reg = <0>; reg = <0>;
label = "eth_cu_1000_1"; label = "eth_cu_1000_1";
}; };
port@1 { ethernet-port@1 {
reg = <1>; reg = <1>;
label = "eth_cu_1000_2"; label = "eth_cu_1000_2";
}; };
port@2 { ethernet-port@2 {
reg = <2>; reg = <2>;
label = "eth_cu_1000_3"; label = "eth_cu_1000_3";
}; };
port@5 { ethernet-port@5 {
reg = <5>; reg = <5>;
label = "eth_fc_1000_1"; label = "eth_fc_1000_1";
phy-mode = "1000base-x"; phy-mode = "1000base-x";
...@@ -200,7 +200,7 @@ port@5 { ...@@ -200,7 +200,7 @@ port@5 {
sfp = <&sff>; sfp = <&sff>;
}; };
port@6 { ethernet-port@6 {
reg = <6>; reg = <6>;
phy-mode = "rmii"; phy-mode = "rmii";
ethernet = <&fec1>; ethernet = <&fec1>;
......
...@@ -47,17 +47,17 @@ mdio_mux_1: mdio@1 { ...@@ -47,17 +47,17 @@ mdio_mux_1: mdio@1 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
switch0: switch0@0 { switch0: ethernet-switch@0 {
compatible = "marvell,mv88e6190"; compatible = "marvell,mv88e6190";
reg = <0>; reg = <0>;
dsa,member = <0 0>; dsa,member = <0 0>;
eeprom-length = <65536>; eeprom-length = <65536>;
ports { ethernet-ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
port@0 { ethernet-port@0 {
reg = <0>; reg = <0>;
phy-mode = "rmii"; phy-mode = "rmii";
ethernet = <&fec1>; ethernet = <&fec1>;
...@@ -68,37 +68,37 @@ fixed-link { ...@@ -68,37 +68,37 @@ fixed-link {
}; };
}; };
port@1 { ethernet-port@1 {
reg = <1>; reg = <1>;
label = "aib2main_1"; label = "aib2main_1";
}; };
port@2 { ethernet-port@2 {
reg = <2>; reg = <2>;
label = "aib2main_2"; label = "aib2main_2";
}; };
port@3 { ethernet-port@3 {
reg = <3>; reg = <3>;
label = "eth_cu_1000_5"; label = "eth_cu_1000_5";
}; };
port@4 { ethernet-port@4 {
reg = <4>; reg = <4>;
label = "eth_cu_1000_6"; label = "eth_cu_1000_6";
}; };
port@5 { ethernet-port@5 {
reg = <5>; reg = <5>;
label = "eth_cu_1000_4"; label = "eth_cu_1000_4";
}; };
port@6 { ethernet-port@6 {
reg = <6>; reg = <6>;
label = "eth_cu_1000_7"; label = "eth_cu_1000_7";
}; };
port@7 { ethernet-port@7 {
reg = <7>; reg = <7>;
label = "modem_pic"; label = "modem_pic";
...@@ -108,7 +108,7 @@ fixed-link { ...@@ -108,7 +108,7 @@ fixed-link {
}; };
}; };
switch0port10: port@10 { switch0port10: ethernet-port@10 {
reg = <10>; reg = <10>;
label = "dsa"; label = "dsa";
phy-mode = "xgmii"; phy-mode = "xgmii";
...@@ -130,32 +130,32 @@ mdio_mux_2: mdio@2 { ...@@ -130,32 +130,32 @@ mdio_mux_2: mdio@2 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
switch1: switch1@0 { switch1: ethernet-switch@0 {
compatible = "marvell,mv88e6190"; compatible = "marvell,mv88e6190";
reg = <0>; reg = <0>;
dsa,member = <0 1>; dsa,member = <0 1>;
eeprom-length = <65536>; eeprom-length = <65536>;
ports { ethernet-ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
port@1 { ethernet-port@1 {
reg = <1>; reg = <1>;
label = "eth_cu_1000_3"; label = "eth_cu_1000_3";
}; };
port@2 { ethernet-port@2 {
reg = <2>; reg = <2>;
label = "eth_cu_100_2"; label = "eth_cu_100_2";
}; };
port@3 { ethernet-port@3 {
reg = <3>; reg = <3>;
label = "eth_cu_100_3"; label = "eth_cu_100_3";
}; };
switch1port9: port@9 { switch1port9: ethernet-port@9 {
reg = <9>; reg = <9>;
label = "dsa"; label = "dsa";
phy-mode = "xgmii"; phy-mode = "xgmii";
...@@ -168,7 +168,7 @@ fixed-link { ...@@ -168,7 +168,7 @@ fixed-link {
}; };
}; };
switch1port10: port@10 { switch1port10: ethernet-port@10 {
reg = <10>; reg = <10>;
label = "dsa"; label = "dsa";
phy-mode = "xgmii"; phy-mode = "xgmii";
...@@ -188,17 +188,17 @@ mdio_mux_4: mdio@4 { ...@@ -188,17 +188,17 @@ mdio_mux_4: mdio@4 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
switch2: switch2@0 { switch2: ethernet-switch@0 {
compatible = "marvell,mv88e6190"; compatible = "marvell,mv88e6190";
reg = <0>; reg = <0>;
dsa,member = <0 2>; dsa,member = <0 2>;
eeprom-length = <65536>; eeprom-length = <65536>;
ports { ethernet-ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
port@2 { ethernet-port@2 {
reg = <2>; reg = <2>;
label = "eth_fc_1000_2"; label = "eth_fc_1000_2";
phy-mode = "1000base-x"; phy-mode = "1000base-x";
...@@ -206,7 +206,7 @@ port@2 { ...@@ -206,7 +206,7 @@ port@2 {
sfp = <&sff1>; sfp = <&sff1>;
}; };
port@3 { ethernet-port@3 {
reg = <3>; reg = <3>;
label = "eth_fc_1000_3"; label = "eth_fc_1000_3";
phy-mode = "1000base-x"; phy-mode = "1000base-x";
...@@ -214,7 +214,7 @@ port@3 { ...@@ -214,7 +214,7 @@ port@3 {
sfp = <&sff2>; sfp = <&sff2>;
}; };
port@4 { ethernet-port@4 {
reg = <4>; reg = <4>;
label = "eth_fc_1000_4"; label = "eth_fc_1000_4";
phy-mode = "1000base-x"; phy-mode = "1000base-x";
...@@ -222,7 +222,7 @@ port@4 { ...@@ -222,7 +222,7 @@ port@4 {
sfp = <&sff3>; sfp = <&sff3>;
}; };
port@5 { ethernet-port@5 {
reg = <5>; reg = <5>;
label = "eth_fc_1000_5"; label = "eth_fc_1000_5";
phy-mode = "1000base-x"; phy-mode = "1000base-x";
...@@ -230,7 +230,7 @@ port@5 { ...@@ -230,7 +230,7 @@ port@5 {
sfp = <&sff4>; sfp = <&sff4>;
}; };
port@6 { ethernet-port@6 {
reg = <6>; reg = <6>;
label = "eth_fc_1000_6"; label = "eth_fc_1000_6";
phy-mode = "1000base-x"; phy-mode = "1000base-x";
...@@ -238,7 +238,7 @@ port@6 { ...@@ -238,7 +238,7 @@ port@6 {
sfp = <&sff5>; sfp = <&sff5>;
}; };
port@7 { ethernet-port@7 {
reg = <7>; reg = <7>;
label = "eth_fc_1000_7"; label = "eth_fc_1000_7";
phy-mode = "1000base-x"; phy-mode = "1000base-x";
...@@ -246,7 +246,7 @@ port@7 { ...@@ -246,7 +246,7 @@ port@7 {
sfp = <&sff6>; sfp = <&sff6>;
}; };
port@9 { ethernet-port@9 {
reg = <9>; reg = <9>;
label = "eth_fc_1000_1"; label = "eth_fc_1000_1";
phy-mode = "1000base-x"; phy-mode = "1000base-x";
...@@ -254,7 +254,7 @@ port@9 { ...@@ -254,7 +254,7 @@ port@9 {
sfp = <&sff0>; sfp = <&sff0>;
}; };
switch2port10: port@10 { switch2port10: ethernet-port@10 {
reg = <10>; reg = <10>;
label = "dsa"; label = "dsa";
phy-mode = "2500base-x"; phy-mode = "2500base-x";
...@@ -276,17 +276,17 @@ mdio_mux_8: mdio@8 { ...@@ -276,17 +276,17 @@ mdio_mux_8: mdio@8 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
switch3: switch3@0 { switch3: ethernet-switch@0 {
compatible = "marvell,mv88e6190"; compatible = "marvell,mv88e6190";
reg = <0>; reg = <0>;
dsa,member = <0 3>; dsa,member = <0 3>;
eeprom-length = <65536>; eeprom-length = <65536>;
ports { ethernet-ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
port@2 { ethernet-port@2 {
reg = <2>; reg = <2>;
label = "eth_fc_1000_8"; label = "eth_fc_1000_8";
phy-mode = "1000base-x"; phy-mode = "1000base-x";
...@@ -294,7 +294,7 @@ port@2 { ...@@ -294,7 +294,7 @@ port@2 {
sfp = <&sff7>; sfp = <&sff7>;
}; };
port@3 { ethernet-port@3 {
reg = <3>; reg = <3>;
label = "eth_fc_1000_9"; label = "eth_fc_1000_9";
phy-mode = "1000base-x"; phy-mode = "1000base-x";
...@@ -302,7 +302,7 @@ port@3 { ...@@ -302,7 +302,7 @@ port@3 {
sfp = <&sff8>; sfp = <&sff8>;
}; };
port@4 { ethernet-port@4 {
reg = <4>; reg = <4>;
label = "eth_fc_1000_10"; label = "eth_fc_1000_10";
phy-mode = "1000base-x"; phy-mode = "1000base-x";
...@@ -310,7 +310,7 @@ port@4 { ...@@ -310,7 +310,7 @@ port@4 {
sfp = <&sff9>; sfp = <&sff9>;
}; };
switch3port9: port@9 { switch3port9: ethernet-port@9 {
reg = <9>; reg = <9>;
label = "dsa"; label = "dsa";
phy-mode = "2500base-x"; phy-mode = "2500base-x";
...@@ -322,7 +322,7 @@ fixed-link { ...@@ -322,7 +322,7 @@ fixed-link {
}; };
}; };
switch3port10: port@10 { switch3port10: ethernet-port@10 {
reg = <10>; reg = <10>;
label = "dsa"; label = "dsa";
phy-mode = "xgmii"; phy-mode = "xgmii";
......
...@@ -123,7 +123,7 @@ mdio1: mdio { ...@@ -123,7 +123,7 @@ mdio1: mdio {
suppress-preamble; suppress-preamble;
status = "okay"; status = "okay";
switch0: switch0@0 { switch0: ethernet-switch@0 {
compatible = "marvell,mv88e6190"; compatible = "marvell,mv88e6190";
pinctrl-0 = <&pinctrl_gpio_switch0>; pinctrl-0 = <&pinctrl_gpio_switch0>;
pinctrl-names = "default"; pinctrl-names = "default";
...@@ -134,11 +134,11 @@ switch0: switch0@0 { ...@@ -134,11 +134,11 @@ switch0: switch0@0 {
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
ports { ethernet-ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
port@0 { ethernet-port@0 {
reg = <0>; reg = <0>;
phy-mode = "rmii"; phy-mode = "rmii";
ethernet = <&fec1>; ethernet = <&fec1>;
...@@ -149,32 +149,32 @@ fixed-link { ...@@ -149,32 +149,32 @@ fixed-link {
}; };
}; };
port@1 { ethernet-port@1 {
reg = <1>; reg = <1>;
label = "eth_cu_1000_1"; label = "eth_cu_1000_1";
}; };
port@2 { ethernet-port@2 {
reg = <2>; reg = <2>;
label = "eth_cu_1000_2"; label = "eth_cu_1000_2";
}; };
port@3 { ethernet-port@3 {
reg = <3>; reg = <3>;
label = "eth_cu_1000_3"; label = "eth_cu_1000_3";
}; };
port@4 { ethernet-port@4 {
reg = <4>; reg = <4>;
label = "eth_cu_1000_4"; label = "eth_cu_1000_4";
}; };
port@5 { ethernet-port@5 {
reg = <5>; reg = <5>;
label = "eth_cu_1000_5"; label = "eth_cu_1000_5";
}; };
port@6 { ethernet-port@6 {
reg = <6>; reg = <6>;
label = "eth_cu_1000_6"; label = "eth_cu_1000_6";
}; };
......
...@@ -112,7 +112,7 @@ mdio1: mdio { ...@@ -112,7 +112,7 @@ mdio1: mdio {
suppress-preamble; suppress-preamble;
status = "okay"; status = "okay";
switch0: switch0@0 { switch0: ethernet-switch@0 {
compatible = "marvell,mv88e6190"; compatible = "marvell,mv88e6190";
pinctrl-0 = <&pinctrl_gpio_switch0>; pinctrl-0 = <&pinctrl_gpio_switch0>;
pinctrl-names = "default"; pinctrl-names = "default";
...@@ -123,11 +123,11 @@ switch0: switch0@0 { ...@@ -123,11 +123,11 @@ switch0: switch0@0 {
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
ports { ethernet-ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
port@0 { ethernet-port@0 {
reg = <0>; reg = <0>;
phy-mode = "rmii"; phy-mode = "rmii";
ethernet = <&fec1>; ethernet = <&fec1>;
...@@ -138,27 +138,27 @@ fixed-link { ...@@ -138,27 +138,27 @@ fixed-link {
}; };
}; };
port@1 { ethernet-port@1 {
reg = <1>; reg = <1>;
label = "eth_cu_100_3"; label = "eth_cu_100_3";
}; };
port@5 { ethernet-port@5 {
reg = <5>; reg = <5>;
label = "eth_cu_1000_4"; label = "eth_cu_1000_4";
}; };
port@6 { ethernet-port@6 {
reg = <6>; reg = <6>;
label = "eth_cu_1000_5"; label = "eth_cu_1000_5";
}; };
port@8 { ethernet-port@8 {
reg = <8>; reg = <8>;
label = "eth_cu_1000_1"; label = "eth_cu_1000_1";
}; };
port@9 { ethernet-port@9 {
reg = <9>; reg = <9>;
label = "eth_cu_1000_2"; label = "eth_cu_1000_2";
phy-handle = <&phy9>; phy-handle = <&phy9>;
...@@ -167,12 +167,12 @@ port@9 { ...@@ -167,12 +167,12 @@ port@9 {
}; };
}; };
mdio1 { mdio-external {
compatible = "marvell,mv88e6xxx-mdio-external"; compatible = "marvell,mv88e6xxx-mdio-external";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
phy9: phy9@0 { phy9: ethernet-phy@0 {
compatible = "ethernet-phy-ieee802.3-c45"; compatible = "ethernet-phy-ieee802.3-c45";
pinctrl-0 = <&pinctrl_gpio_phy9>; pinctrl-0 = <&pinctrl_gpio_phy9>;
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -137,7 +137,7 @@ mdio1: mdio { ...@@ -137,7 +137,7 @@ mdio1: mdio {
suppress-preamble; suppress-preamble;
status = "okay"; status = "okay";
switch0: switch0@0 { switch0: ethernet-switch@0 {
compatible = "marvell,mv88e6190"; compatible = "marvell,mv88e6190";
pinctrl-0 = <&pinctrl_gpio_switch0>; pinctrl-0 = <&pinctrl_gpio_switch0>;
pinctrl-names = "default"; pinctrl-names = "default";
...@@ -148,11 +148,11 @@ switch0: switch0@0 { ...@@ -148,11 +148,11 @@ switch0: switch0@0 {
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
ports { ethernet-ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
port@0 { ethernet-port@0 {
reg = <0>; reg = <0>;
phy-mode = "rmii"; phy-mode = "rmii";
ethernet = <&fec1>; ethernet = <&fec1>;
...@@ -163,32 +163,32 @@ fixed-link { ...@@ -163,32 +163,32 @@ fixed-link {
}; };
}; };
port@1 { ethernet-port@1 {
reg = <1>; reg = <1>;
label = "eth_cu_1000_1"; label = "eth_cu_1000_1";
}; };
port@2 { ethernet-port@2 {
reg = <2>; reg = <2>;
label = "eth_cu_1000_2"; label = "eth_cu_1000_2";
}; };
port@3 { ethernet-port@3 {
reg = <3>; reg = <3>;
label = "eth_cu_1000_3"; label = "eth_cu_1000_3";
}; };
port@4 { ethernet-port@4 {
reg = <4>; reg = <4>;
label = "eth_cu_1000_4"; label = "eth_cu_1000_4";
}; };
port@5 { ethernet-port@5 {
reg = <5>; reg = <5>;
label = "eth_cu_1000_5"; label = "eth_cu_1000_5";
}; };
port@6 { ethernet-port@6 {
reg = <6>; reg = <6>;
label = "eth_cu_1000_6"; label = "eth_cu_1000_6";
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment