[PATCH v9] ARM: dts: nxp: Fix some common switch mistakes
Linus Walleij
linus.walleij at linaro.org
Mon Nov 27 07:55:20 PST 2023
Fix some errors in the Marvell MV88E6xxx switch descriptions:
- switch0 at 0 is not OK, should be ethernet-switch at 0
- ports should be ethernet-ports
- port should be ethernet-port
- phy should be ethernet-phy
Reviewed-by: Andrew Lunn <andrew at lunn.ch>
Reviewed-by: Florian Fainelli <florian.fainelli at broadcom.com>
Signed-off-by: Linus Walleij <linus.walleij at linaro.org>
---
This patch is split off from the actual bindings so these can
be merged to netdev. Applying it will fix warnings that will
appear from device tree checks.
Link to v9 bindings patches:
https://lore.kernel.org/r/20231127-marvell-88e6152-wan-led-v9-0-272934e04681@linaro.org
---
arch/arm/boot/dts/nxp/vf/vf610-zii-cfu1.dts | 14 ++---
arch/arm/boot/dts/nxp/vf/vf610-zii-scu4-aib.dts | 70 ++++++++++++------------
arch/arm/boot/dts/nxp/vf/vf610-zii-spb4.dts | 18 +++---
arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-dtu.dts | 20 +++----
arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-spu3.dts | 18 +++---
5 files changed, 70 insertions(+), 70 deletions(-)
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 1a19aec8957b..7e72f860c3c5 100644
--- 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 at 0 {
+ switch0: ethernet-switch at 0 {
compatible = "marvell,mv88e6085";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_switch>;
@@ -173,26 +173,26 @@ switch0: switch0 at 0 {
interrupt-controller;
#interrupt-cells = <2>;
- ports {
+ ethernet-ports {
#address-cells = <1>;
#size-cells = <0>;
- port at 0 {
+ ethernet-port at 0 {
reg = <0>;
label = "eth_cu_1000_1";
};
- port at 1 {
+ ethernet-port at 1 {
reg = <1>;
label = "eth_cu_1000_2";
};
- port at 2 {
+ ethernet-port at 2 {
reg = <2>;
label = "eth_cu_1000_3";
};
- port at 5 {
+ ethernet-port at 5 {
reg = <5>;
label = "eth_fc_1000_1";
phy-mode = "1000base-x";
@@ -200,7 +200,7 @@ port at 5 {
sfp = <&sff>;
};
- port at 6 {
+ ethernet-port at 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 df1335492a19..77492eeea450 100644
--- 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 at 1 {
#address-cells = <1>;
#size-cells = <0>;
- switch0: switch0 at 0 {
+ switch0: ethernet-switch at 0 {
compatible = "marvell,mv88e6190";
reg = <0>;
dsa,member = <0 0>;
eeprom-length = <65536>;
- ports {
+ ethernet-ports {
#address-cells = <1>;
#size-cells = <0>;
- port at 0 {
+ ethernet-port at 0 {
reg = <0>;
phy-mode = "rmii";
ethernet = <&fec1>;
@@ -68,37 +68,37 @@ fixed-link {
};
};
- port at 1 {
+ ethernet-port at 1 {
reg = <1>;
label = "aib2main_1";
};
- port at 2 {
+ ethernet-port at 2 {
reg = <2>;
label = "aib2main_2";
};
- port at 3 {
+ ethernet-port at 3 {
reg = <3>;
label = "eth_cu_1000_5";
};
- port at 4 {
+ ethernet-port at 4 {
reg = <4>;
label = "eth_cu_1000_6";
};
- port at 5 {
+ ethernet-port at 5 {
reg = <5>;
label = "eth_cu_1000_4";
};
- port at 6 {
+ ethernet-port at 6 {
reg = <6>;
label = "eth_cu_1000_7";
};
- port at 7 {
+ ethernet-port at 7 {
reg = <7>;
label = "modem_pic";
@@ -108,7 +108,7 @@ fixed-link {
};
};
- switch0port10: port at 10 {
+ switch0port10: ethernet-port at 10 {
reg = <10>;
label = "dsa";
phy-mode = "xgmii";
@@ -130,32 +130,32 @@ mdio_mux_2: mdio at 2 {
#address-cells = <1>;
#size-cells = <0>;
- switch1: switch1 at 0 {
+ switch1: ethernet-switch at 0 {
compatible = "marvell,mv88e6190";
reg = <0>;
dsa,member = <0 1>;
eeprom-length = <65536>;
- ports {
+ ethernet-ports {
#address-cells = <1>;
#size-cells = <0>;
- port at 1 {
+ ethernet-port at 1 {
reg = <1>;
label = "eth_cu_1000_3";
};
- port at 2 {
+ ethernet-port at 2 {
reg = <2>;
label = "eth_cu_100_2";
};
- port at 3 {
+ ethernet-port at 3 {
reg = <3>;
label = "eth_cu_100_3";
};
- switch1port9: port at 9 {
+ switch1port9: ethernet-port at 9 {
reg = <9>;
label = "dsa";
phy-mode = "xgmii";
@@ -168,7 +168,7 @@ fixed-link {
};
};
- switch1port10: port at 10 {
+ switch1port10: ethernet-port at 10 {
reg = <10>;
label = "dsa";
phy-mode = "xgmii";
@@ -188,17 +188,17 @@ mdio_mux_4: mdio at 4 {
#address-cells = <1>;
#size-cells = <0>;
- switch2: switch2 at 0 {
+ switch2: ethernet-switch at 0 {
compatible = "marvell,mv88e6190";
reg = <0>;
dsa,member = <0 2>;
eeprom-length = <65536>;
- ports {
+ ethernet-ports {
#address-cells = <1>;
#size-cells = <0>;
- port at 2 {
+ ethernet-port at 2 {
reg = <2>;
label = "eth_fc_1000_2";
phy-mode = "1000base-x";
@@ -206,7 +206,7 @@ port at 2 {
sfp = <&sff1>;
};
- port at 3 {
+ ethernet-port at 3 {
reg = <3>;
label = "eth_fc_1000_3";
phy-mode = "1000base-x";
@@ -214,7 +214,7 @@ port at 3 {
sfp = <&sff2>;
};
- port at 4 {
+ ethernet-port at 4 {
reg = <4>;
label = "eth_fc_1000_4";
phy-mode = "1000base-x";
@@ -222,7 +222,7 @@ port at 4 {
sfp = <&sff3>;
};
- port at 5 {
+ ethernet-port at 5 {
reg = <5>;
label = "eth_fc_1000_5";
phy-mode = "1000base-x";
@@ -230,7 +230,7 @@ port at 5 {
sfp = <&sff4>;
};
- port at 6 {
+ ethernet-port at 6 {
reg = <6>;
label = "eth_fc_1000_6";
phy-mode = "1000base-x";
@@ -238,7 +238,7 @@ port at 6 {
sfp = <&sff5>;
};
- port at 7 {
+ ethernet-port at 7 {
reg = <7>;
label = "eth_fc_1000_7";
phy-mode = "1000base-x";
@@ -246,7 +246,7 @@ port at 7 {
sfp = <&sff6>;
};
- port at 9 {
+ ethernet-port at 9 {
reg = <9>;
label = "eth_fc_1000_1";
phy-mode = "1000base-x";
@@ -254,7 +254,7 @@ port at 9 {
sfp = <&sff0>;
};
- switch2port10: port at 10 {
+ switch2port10: ethernet-port at 10 {
reg = <10>;
label = "dsa";
phy-mode = "2500base-x";
@@ -276,17 +276,17 @@ mdio_mux_8: mdio at 8 {
#address-cells = <1>;
#size-cells = <0>;
- switch3: switch3 at 0 {
+ switch3: ethernet-switch at 0 {
compatible = "marvell,mv88e6190";
reg = <0>;
dsa,member = <0 3>;
eeprom-length = <65536>;
- ports {
+ ethernet-ports {
#address-cells = <1>;
#size-cells = <0>;
- port at 2 {
+ ethernet-port at 2 {
reg = <2>;
label = "eth_fc_1000_8";
phy-mode = "1000base-x";
@@ -294,7 +294,7 @@ port at 2 {
sfp = <&sff7>;
};
- port at 3 {
+ ethernet-port at 3 {
reg = <3>;
label = "eth_fc_1000_9";
phy-mode = "1000base-x";
@@ -302,7 +302,7 @@ port at 3 {
sfp = <&sff8>;
};
- port at 4 {
+ ethernet-port at 4 {
reg = <4>;
label = "eth_fc_1000_10";
phy-mode = "1000base-x";
@@ -310,7 +310,7 @@ port at 4 {
sfp = <&sff9>;
};
- switch3port9: port at 9 {
+ switch3port9: ethernet-port at 9 {
reg = <9>;
label = "dsa";
phy-mode = "2500base-x";
@@ -322,7 +322,7 @@ fixed-link {
};
};
- switch3port10: port at 10 {
+ switch3port10: ethernet-port at 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 1461804ecaea..2a490464660c 100644
--- 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 at 0 {
+ switch0: ethernet-switch at 0 {
compatible = "marvell,mv88e6190";
pinctrl-0 = <&pinctrl_gpio_switch0>;
pinctrl-names = "default";
@@ -134,11 +134,11 @@ switch0: switch0 at 0 {
interrupt-controller;
#interrupt-cells = <2>;
- ports {
+ ethernet-ports {
#address-cells = <1>;
#size-cells = <0>;
- port at 0 {
+ ethernet-port at 0 {
reg = <0>;
phy-mode = "rmii";
ethernet = <&fec1>;
@@ -149,32 +149,32 @@ fixed-link {
};
};
- port at 1 {
+ ethernet-port at 1 {
reg = <1>;
label = "eth_cu_1000_1";
};
- port at 2 {
+ ethernet-port at 2 {
reg = <2>;
label = "eth_cu_1000_2";
};
- port at 3 {
+ ethernet-port at 3 {
reg = <3>;
label = "eth_cu_1000_3";
};
- port at 4 {
+ ethernet-port at 4 {
reg = <4>;
label = "eth_cu_1000_4";
};
- port at 5 {
+ ethernet-port at 5 {
reg = <5>;
label = "eth_cu_1000_5";
};
- port at 6 {
+ ethernet-port at 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 463c2452b9b7..078d8699e16d 100644
--- 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 at 0 {
+ switch0: ethernet-switch at 0 {
compatible = "marvell,mv88e6190";
pinctrl-0 = <&pinctrl_gpio_switch0>;
pinctrl-names = "default";
@@ -123,11 +123,11 @@ switch0: switch0 at 0 {
interrupt-controller;
#interrupt-cells = <2>;
- ports {
+ ethernet-ports {
#address-cells = <1>;
#size-cells = <0>;
- port at 0 {
+ ethernet-port at 0 {
reg = <0>;
phy-mode = "rmii";
ethernet = <&fec1>;
@@ -138,27 +138,27 @@ fixed-link {
};
};
- port at 1 {
+ ethernet-port at 1 {
reg = <1>;
label = "eth_cu_100_3";
};
- port at 5 {
+ ethernet-port at 5 {
reg = <5>;
label = "eth_cu_1000_4";
};
- port at 6 {
+ ethernet-port at 6 {
reg = <6>;
label = "eth_cu_1000_5";
};
- port at 8 {
+ ethernet-port at 8 {
reg = <8>;
label = "eth_cu_1000_1";
};
- port at 9 {
+ ethernet-port at 9 {
reg = <9>;
label = "eth_cu_1000_2";
phy-handle = <&phy9>;
@@ -167,12 +167,12 @@ port at 9 {
};
};
- mdio1 {
+ mdio-external {
compatible = "marvell,mv88e6xxx-mdio-external";
#address-cells = <1>;
#size-cells = <0>;
- phy9: phy9 at 0 {
+ phy9: ethernet-phy at 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 f5ae0d5de315..22c8f44390a9 100644
--- 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 at 0 {
+ switch0: ethernet-switch at 0 {
compatible = "marvell,mv88e6190";
pinctrl-0 = <&pinctrl_gpio_switch0>;
pinctrl-names = "default";
@@ -148,11 +148,11 @@ switch0: switch0 at 0 {
interrupt-controller;
#interrupt-cells = <2>;
- ports {
+ ethernet-ports {
#address-cells = <1>;
#size-cells = <0>;
- port at 0 {
+ ethernet-port at 0 {
reg = <0>;
phy-mode = "rmii";
ethernet = <&fec1>;
@@ -163,32 +163,32 @@ fixed-link {
};
};
- port at 1 {
+ ethernet-port at 1 {
reg = <1>;
label = "eth_cu_1000_1";
};
- port at 2 {
+ ethernet-port at 2 {
reg = <2>;
label = "eth_cu_1000_2";
};
- port at 3 {
+ ethernet-port at 3 {
reg = <3>;
label = "eth_cu_1000_3";
};
- port at 4 {
+ ethernet-port at 4 {
reg = <4>;
label = "eth_cu_1000_4";
};
- port at 5 {
+ ethernet-port at 5 {
reg = <5>;
label = "eth_cu_1000_5";
};
- port at 6 {
+ ethernet-port at 6 {
reg = <6>;
label = "eth_cu_1000_6";
};
---
base-commit: b85ea95d086471afb4ad062012a4d73cd328fa86
change-id: 20231127-mv88e6xxx-nxp-57e901c4538e
Best regards,
--
Linus Walleij <linus.walleij at linaro.org>
More information about the linux-arm-kernel
mailing list