niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

ARM: dts: nxp: Fix some common switch mistakes

Browse source 
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>
This commit is contained in:
Linus Walleij 2023-10-24 15:20:30 +02:00 • committed by David S. Miller
parent 2b83557a58
commit bfedd84236
5 changed files with 70 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
arch/arm/boot/dts/nxp/vf/vf610-zii-cfu1.dts
View file

@ -162,7 +162,7 @@
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 @@
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 @@
sfp = <&sff>; sfp = <&sff>;
}; };
port@6 { ethernet-port@6 {
reg = <6>; reg = <6>;
phy-mode = "rmii"; phy-mode = "rmii";
ethernet = <&fec1>; ethernet = <&fec1>;

70
arch/arm/boot/dts/nxp/vf/vf610-zii-scu4-aib.dts
View file

@ -47,17 +47,17 @@
#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 @@
}; };
}; };
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 @@
}; };
}; };
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 @@
#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 @@
}; };
}; };
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 @@
#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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
#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 @@
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 @@
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 @@
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 @@
}; };
}; };
switch3port10: port@10 { switch3port10: ethernet-port@10 {
reg = <10>; reg = <10>;
label = "dsa"; label = "dsa";
phy-mode = "xgmii"; phy-mode = "xgmii";

18
arch/arm/boot/dts/nxp/vf/vf610-zii-spb4.dts
View file

@ -123,7 +123,7 @@
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 @@
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 @@
}; };
}; };
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";
}; };

20
arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-dtu.dts
View file

@ -112,7 +112,7 @@
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 @@
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 @@
}; };
}; };
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 @@
}; };
}; };
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";

18
arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-spu3.dts
View file

@ -137,7 +137,7 @@
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 @@
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 @@
}; };
}; };
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";
}; };