Revert "Merge branch 'mv88e6xxx-dsa-bindings'"

This reverts the following commits:

commit 53313ed25ba8 ("dt-bindings: marvell: Add Marvell MV88E6060 DSA schema")
commit 0f35369b4efe ("dt-bindings: marvell: Rewrite MV88E6xxx in schema")
commit 605a5f5d406d ("ARM64: dts: marvell: Fix some common switch mistakes")
commit bfedd8423643 ("ARM: dts: nxp: Fix some common switch mistakes")
commit 2b83557a588f ("ARM: dts: marvell: Fix some common switch mistakes")
commit ddae07ce9bb3 ("dt-bindings: net: mvusb: Fix up DSA example")
commit b5ef61718ad7 ("dt-bindings: net: dsa: Require ports or ethernet-ports")

As repoted by Vladimir, it breaks boot on the Turris MOX board.

Link: https://lore.kernel.org/all/20231025093632.fb2qdtunzaznd73z@skbuf/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

13 files changed, 178 insertions, 166 deletions

diff --git a/arch/arm/boot/dts/marvell/armada-370-rd.dts b/arch/arm/boot/dts/marvell/armada-370-rd.dts
index 1b241da11e94..b459a670f615 100644
--- a/arch/arm/boot/dts/marvell/armada-370-rd.dts
+++ b/arch/arm/boot/dts/marvell/armada-370-rd.dts
@@ -149,37 +149,39 @@
 		};
 	};
 
-	switch: ethernet-switch@10 {
+	switch: switch@10 {
 		compatible = "marvell,mv88e6085";
+		#address-cells = <1>;
+		#size-cells = <0>;
 		reg = <0x10>;
 		interrupt-controller;
 		#interrupt-cells = <2>;
 
-		ethernet-ports {
+		ports {
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			ethernet-port@0 {
+			port@0 {
 				reg = <0>;
 				label = "lan0";
 			};
 
-			ethernet-port@1 {
+			port@1 {
 				reg = <1>;
 				label = "lan1";
 			};
 
-			ethernet-port@2 {
+			port@2 {
 				reg = <2>;
 				label = "lan2";
 			};
 
-			ethernet-port@3 {
+			port@3 {
 				reg = <3>;
 				label = "lan3";
 			};
 
-			ethernet-port@5 {
+			port@5 {
 				reg = <5>;
 				ethernet = <&eth1>;
 				phy-mode = "rgmii-id";
@@ -194,25 +196,25 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			switchphy0: ethernet-phy@0 {
+			switchphy0: switchphy@0 {
 				reg = <0>;
 				interrupt-parent = <&switch>;
 				interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
 			};
 
-			switchphy1: ethernet-phy@1 {
+			switchphy1: switchphy@1 {
 				reg = <1>;
 				interrupt-parent = <&switch>;
 				interrupts = <1 IRQ_TYPE_LEVEL_HIGH>;
 			};
 
-			switchphy2: ethernet-phy@2 {
+			switchphy2: switchphy@2 {
 				reg = <2>;
 				interrupt-parent = <&switch>;
 				interrupts = <2 IRQ_TYPE_LEVEL_HIGH>;
 			};
 
-			switchphy3: ethernet-phy@3 {
+			switchphy3: switchphy@3 {
 				reg = <3>;
 				interrupt-parent = <&switch>;
 				interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/marvell/armada-381-netgear-gs110emx.dts b/arch/arm/boot/dts/marvell/armada-381-netgear-gs110emx.dts
index 5baf83e5253d..f4c4b213ef4e 100644
--- a/arch/arm/boot/dts/marvell/armada-381-netgear-gs110emx.dts
+++ b/arch/arm/boot/dts/marvell/armada-381-netgear-gs110emx.dts
@@ -77,49 +77,51 @@
 	pinctrl-0 = <&mdio_pins>;
 	status = "okay";
 
-	ethernet-switch@0 {
+	switch@0 {
 		compatible = "marvell,mv88e6190";
+		#address-cells = <1>;
 		#interrupt-cells = <2>;
 		interrupt-controller;
 		interrupt-parent = <&gpio1>;
 		interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
 		pinctrl-0 = <&switch_interrupt_pins>;
 		pinctrl-names = "default";
+		#size-cells = <0>;
 		reg = <0>;
 
 		mdio {
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			switch0phy1: ethernet-phy@1 {
+			switch0phy1: switch0phy1@1 {
 				reg = <0x1>;
 			};
 
-			switch0phy2: ethernet-phy@2 {
+			switch0phy2: switch0phy2@2 {
 				reg = <0x2>;
 			};
 
-			switch0phy3: ethernet-phy@3 {
+			switch0phy3: switch0phy3@3 {
 				reg = <0x3>;
 			};
 
-			switch0phy4: ethernet-phy@4 {
+			switch0phy4: switch0phy4@4 {
 				reg = <0x4>;
 			};
 
-			switch0phy5: ethernet-phy@5 {
+			switch0phy5: switch0phy5@5 {
 				reg = <0x5>;
 			};
 
-			switch0phy6: ethernet-phy@6 {
+			switch0phy6: switch0phy6@6 {
 				reg = <0x6>;
 			};
 
-			switch0phy7: ethernet-phy@7 {
+			switch0phy7: switch0phy7@7 {
 				reg = <0x7>;
 			};
 
-			switch0phy8: ethernet-phy@8 {
+			switch0phy8: switch0phy8@8 {
 				reg = <0x8>;
 			};
 		};
@@ -140,11 +142,11 @@
 			};
 		};
 
-		ethernet-ports {
+		ports {
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			ethernet-port@0 {
+			port@0 {
 				ethernet = <&eth0>;
 				phy-mode = "rgmii";
 				reg = <0>;
@@ -156,55 +158,55 @@
 				};
 			};
 
-			ethernet-port@1 {
+			port@1 {
 				label = "lan1";
 				phy-handle = <&switch0phy1>;
 				reg = <1>;
 			};
 
-			ethernet-port@2 {
+			port@2 {
 				label = "lan2";
 				phy-handle = <&switch0phy2>;
 				reg = <2>;
 			};
 
-			ethernet-port@3 {
+			port@3 {
 				label = "lan3";
 				phy-handle = <&switch0phy3>;
 				reg = <3>;
 			};
 
-			ethernet-port@4 {
+			port@4 {
 				label = "lan4";
 				phy-handle = <&switch0phy4>;
 				reg = <4>;
 			};
 
-			ethernet-port@5 {
+			port@5 {
 				label = "lan5";
 				phy-handle = <&switch0phy5>;
 				reg = <5>;
 			};
 
-			ethernet-port@6 {
+			port@6 {
 				label = "lan6";
 				phy-handle = <&switch0phy6>;
 				reg = <6>;
 			};
 
-			ethernet-port@7 {
+			port@7 {
 				label = "lan7";
 				phy-handle = <&switch0phy7>;
 				reg = <7>;
 			};
 
-			ethernet-port@8 {
+			port@8 {
 				label = "lan8";
 				phy-handle = <&switch0phy8>;
 				reg = <8>;
 			};
 
-			ethernet-port@9 {
+			port@9 {
 				/* 88X3310P external phy */
 				label = "lan9";
 				phy-handle = <&phy1>;
@@ -212,7 +214,7 @@
 				reg = <9>;
 			};
 
-			ethernet-port@a {
+			port@a {
 				/* 88X3310P external phy */
 				label = "lan10";
 				phy-handle = <&phy2>;
diff --git a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts b/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts
index 1707d1b01545..1990f7d0cc79 100644
--- a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts
+++ b/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts
@@ -7,66 +7,66 @@
 };
 
 &mdio {
-	switch0: ethernet-switch@4 {
+	switch0: switch0@4 {
 		compatible = "marvell,mv88e6190";
 		reg = <4>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&cf_gtr_switch_reset_pins>;
 		reset-gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
 
-		ethernet-ports {
+		ports {
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			ethernet-port@1 {
+			port@1 {
 				reg = <1>;
 				label = "lan8";
 				phy-handle = <&switch0phy0>;
 			};
 
-			ethernet-port@2 {
+			port@2 {
 				reg = <2>;
 				label = "lan7";
 				phy-handle = <&switch0phy1>;
 			};
 
-			ethernet-port@3 {
+			port@3 {
 				reg = <3>;
 				label = "lan6";
 				phy-handle = <&switch0phy2>;
 			};
 
-			ethernet-port@4 {
+			port@4 {
 				reg = <4>;
 				label = "lan5";
 				phy-handle = <&switch0phy3>;
 			};
 
-			ethernet-port@5 {
+			port@5 {
 				reg = <5>;
 				label = "lan4";
 				phy-handle = <&switch0phy4>;
 			};
 
-			ethernet-port@6 {
+			port@6 {
 				reg = <6>;
 				label = "lan3";
 				phy-handle = <&switch0phy5>;
 			};
 
-			ethernet-port@7 {
+			port@7 {
 				reg = <7>;
 				label = "lan2";
 				phy-handle = <&switch0phy6>;
 			};
 
-			ethernet-port@8 {
+			port@8 {
 				reg = <8>;
 				label = "lan1";
 				phy-handle = <&switch0phy7>;
 			};
 
-			ethernet-port@10 {
+			port@10 {
 				reg = <10>;
 				phy-mode = "2500base-x";
 
@@ -83,35 +83,35 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			switch0phy0: ethernet-phy@1 {
+			switch0phy0: switch0phy0@1 {
 				reg = <0x1>;
 			};
 
-			switch0phy1: ethernet-phy@2 {
+			switch0phy1: switch0phy1@2 {
 				reg = <0x2>;
 			};
 
-			switch0phy2: ethernet-phy@3 {
+			switch0phy2: switch0phy2@3 {
 				reg = <0x3>;
 			};
 
-			switch0phy3: ethernet-phy@4 {
+			switch0phy3: switch0phy3@4 {
 				reg = <0x4>;
 			};
 
-			switch0phy4: ethernet-phy@5 {
+			switch0phy4: switch0phy4@5 {
 				reg = <0x5>;
 			};
 
-			switch0phy5: ethernet-phy@6 {
+			switch0phy5: switch0phy5@6 {
 				reg = <0x6>;
 			};
 
-			switch0phy6: ethernet-phy@7 {
+			switch0phy6: switch0phy6@7 {
 				reg = <0x7>;
 			};
 
-			switch0phy7: ethernet-phy@8 {
+			switch0phy7: switch0phy7@8 {
 				reg = <0x8>;
 			};
 		};
diff --git a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts b/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts
index a7678a784c18..b795ad573891 100644
--- a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts
+++ b/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts
@@ -11,42 +11,42 @@
 };
 
 &mdio {
-	switch0: ethernet-switch@4 {
+	switch0: switch0@4 {
 		compatible = "marvell,mv88e6085";
 		reg = <4>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&cf_gtr_switch_reset_pins>;
 		reset-gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
 
-		ethernet-ports {
+		ports {
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			ethernet-port@1 {
+			port@1 {
 				reg = <1>;
 				label = "lan2";
 				phy-handle = <&switch0phy0>;
 			};
 
-			ethernet-port@2 {
+			port@2 {
 				reg = <2>;
 				label = "lan1";
 				phy-handle = <&switch0phy1>;
 			};
 
-			ethernet-port@3 {
+			port@3 {
 				reg = <3>;
 				label = "lan4";
 				phy-handle = <&switch0phy2>;
 			};
 
-			ethernet-port@4 {
+			port@4 {
 				reg = <4>;
 				label = "lan3";
 				phy-handle = <&switch0phy3>;
 			};
 
-			ethernet-port@5 {
+			port@5 {
 				reg = <5>;
 				phy-mode = "2500base-x";
 				ethernet = <&eth1>;
@@ -63,19 +63,19 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			switch0phy0: ethernet-phy@11 {
+			switch0phy0: switch0phy0@11 {
 				reg = <0x11>;
 			};
 
-			switch0phy1: ethernet-phy@12 {
+			switch0phy1: switch0phy1@12 {
 				reg = <0x12>;
 			};
 
-			switch0phy2: ethernet-phy@13 {
+			switch0phy2: switch0phy2@13 {
 				reg = <0x13>;
 			};
 
-			switch0phy3: ethernet-phy@14 {
+			switch0phy3: switch0phy3@14 {
 				reg = <0x14>;
 			};
 		};
diff --git a/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi b/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi
index 4116ed60f709..fc8216fd9f60 100644
--- a/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi
@@ -158,40 +158,42 @@
 &mdio {
 	status = "okay";
 
-	ethernet-switch@0 {
+	switch@0 {
 		compatible = "marvell,mv88e6085";
+		#address-cells = <1>;
+		#size-cells = <0>;
 		reg = <0>;
 
-		ethernet-ports {
+		ports {
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			ethernet-port@0 {
+			port@0 {
 				reg = <0>;
 				label = "lan4";
 			};
 
-			ethernet-port@1 {
+			port@1 {
 				reg = <1>;
 				label = "lan3";
 			};
 
-			ethernet-port@2 {
+			port@2 {
 				reg = <2>;
 				label = "lan2";
 			};
 
-			ethernet-port@3 {
+			port@3 {
 				reg = <3>;
 				label = "lan1";
 			};
 
-			ethernet-port@4 {
+			port@4 {
 				reg = <4>;
 				label = "wan";
 			};
 
-			ethernet-port@5 {
+			port@5 {
 				reg = <5>;
 				phy-mode = "sgmii";
 				ethernet = <&eth2>;
diff --git a/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts b/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts
index 7b755bb4e4e7..2d8d319bec83 100644
--- a/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts
+++ b/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts
@@ -435,10 +435,12 @@
 	};
 
 	/* Switch MV88E6176 at address 0x10 */
-	ethernet-switch@10 {
+	switch@10 {
 		pinctrl-names = "default";
 		pinctrl-0 = <&swint_pins>;
 		compatible = "marvell,mv88e6085";
+		#address-cells = <1>;
+		#size-cells = <0>;
 
 		dsa,member = <0 0>;
 		reg = <0x10>;
@@ -446,36 +448,36 @@
 		interrupt-parent = <&gpio1>;
 		interrupts = <13 IRQ_TYPE_LEVEL_LOW>;
 
-		ethernet-ports {
+		ports {
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			ethernet-port@0 {
+			ports@0 {
 				reg = <0>;
 				label = "lan0";
 			};
 
-			ethernet-port@1 {
+			ports@1 {
 				reg = <1>;
 				label = "lan1";
 			};
 
-			ethernet-port@2 {
+			ports@2 {
 				reg = <2>;
 				label = "lan2";
 			};
 
-			ethernet-port@3 {
+			ports@3 {
 				reg = <3>;
 				label = "lan3";
 			};
 
-			ethernet-port@4 {
+			ports@4 {
 				reg = <4>;
 				label = "lan4";
 			};
 
-			ethernet-port@5 {
+			ports@5 {
 				reg = <5>;
 				ethernet = <&eth1>;
 				phy-mode = "rgmii-id";
@@ -486,7 +488,7 @@
 				};
 			};
 
-			ethernet-port@6 {
+			ports@6 {
 				reg = <6>;
 				ethernet = <&eth0>;
 				phy-mode = "rgmii-id";
diff --git a/arch/arm/boot/dts/marvell/armada-388-clearfog.dts b/arch/arm/boot/dts/marvell/armada-388-clearfog.dts
index 3290ccad2374..32c569df142f 100644
--- a/arch/arm/boot/dts/marvell/armada-388-clearfog.dts
+++ b/arch/arm/boot/dts/marvell/armada-388-clearfog.dts
@@ -92,42 +92,44 @@
 &mdio {
 	status = "okay";
 
-	ethernet-switch@4 {
+	switch@4 {
 		compatible = "marvell,mv88e6085";
+		#address-cells = <1>;
+		#size-cells = <0>;
 		reg = <4>;
 		pinctrl-0 = <&clearfog_dsa0_clk_pins &clearfog_dsa0_pins>;
 		pinctrl-names = "default";
 
-		ethernet-ports {
+		ports {
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			ethernet-port@0 {
+			port@0 {
 				reg = <0>;
 				label = "lan5";
 			};
 
-			ethernet-port@1 {
+			port@1 {
 				reg = <1>;
 				label = "lan4";
 			};
 
-			ethernet-port@2 {
+			port@2 {
 				reg = <2>;
 				label = "lan3";
 			};
 
-			ethernet-port@3 {
+			port@3 {
 				reg = <3>;
 				label = "lan2";
 			};
 
-			ethernet-port@4 {
+			port@4 {
 				reg = <4>;
 				label = "lan1";
 			};
 
-			ethernet-port@5 {
+			port@5 {
 				reg = <5>;
 				ethernet = <&eth1>;
 				phy-mode = "1000base-x";
@@ -138,7 +140,7 @@
 				};
 			};
 
-			ethernet-port@6 {
+			port@6 {
 				/* 88E1512 external phy */
 				reg = <6>;
 				label = "lan6";
diff --git a/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts
index ea859f7ea042..7a0614fd0c93 100644
--- a/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts
+++ b/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts
@@ -265,40 +265,42 @@
 &mdio {
 	status = "okay";
 
-	ethernet-switch@0 {
+	switch@0 {
 		compatible = "marvell,mv88e6085";
+		#address-cells = <1>;
+		#size-cells = <0>;
 		reg = <0>;
 
-		ethernet-ports {
+		ports {
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			ethernet-port@0 {
+			port@0 {
 				reg = <0>;
 				label = "lan4";
 			};
 
-			ethernet-port@1 {
+			port@1 {
 				reg = <1>;
 				label = "lan3";
 			};
 
-			ethernet-port@2 {
+			port@2 {
 				reg = <2>;
 				label = "lan2";
 			};
 
-			ethernet-port@3 {
+			port@3 {
 				reg = <3>;
 				label = "lan1";
 			};
 
-			ethernet-port@4 {
+			port@4 {
 				reg = <4>;
 				label = "internet";
 			};
 
-			ethernet-port@5 {
+			port@5 {
 				reg = <5>;
 				phy-mode = "rgmii-id";
 				ethernet = <&eth0>;
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 7e72f860c3c5..1a19aec8957b 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 @@
 		suppress-preamble;
 		status = "okay";
 
-		switch0: ethernet-switch@0 {
+		switch0: switch0@0 {
 			compatible = "marvell,mv88e6085";
 			pinctrl-names = "default";
 			pinctrl-0 = <&pinctrl_switch>;
@@ -173,26 +173,26 @@
 			interrupt-controller;
 			#interrupt-cells = <2>;
 
-			ethernet-ports {
+			ports {
 				#address-cells = <1>;
 				#size-cells = <0>;
 
-				ethernet-port@0 {
+				port@0 {
 					reg = <0>;
 					label = "eth_cu_1000_1";
 				};
 
-				ethernet-port@1 {
+				port@1 {
 					reg = <1>;
 					label = "eth_cu_1000_2";
 				};
 
-				ethernet-port@2 {
+				port@2 {
 					reg = <2>;
 					label = "eth_cu_1000_3";
 				};
 
-				ethernet-port@5 {
+				port@5 {
 					reg = <5>;
 					label = "eth_fc_1000_1";
 					phy-mode = "1000base-x";
@@ -200,7 +200,7 @@
 					sfp = <&sff>;
 				};
 
-				ethernet-port@6 {
+				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 77492eeea450..df1335492a19 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 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			switch0: ethernet-switch@0 {
+			switch0: switch0@0 {
 				compatible = "marvell,mv88e6190";
 				reg = <0>;
 				dsa,member = <0 0>;
 				eeprom-length = <65536>;
 
-				ethernet-ports {
+				ports {
 					#address-cells = <1>;
 					#size-cells = <0>;
 
-					ethernet-port@0 {
+					port@0 {
 						reg = <0>;
 						phy-mode = "rmii";
 						ethernet = <&fec1>;
@@ -68,37 +68,37 @@
 						};
 					};
 
-					ethernet-port@1 {
+					port@1 {
 						reg = <1>;
 						label = "aib2main_1";
 					};
 
-					ethernet-port@2 {
+					port@2 {
 						reg = <2>;
 						label = "aib2main_2";
 					};
 
-					ethernet-port@3 {
+					port@3 {
 						reg = <3>;
 						label = "eth_cu_1000_5";
 					};
 
-					ethernet-port@4 {
+					port@4 {
 						reg = <4>;
 						label = "eth_cu_1000_6";
 					};
 
-					ethernet-port@5 {
+					port@5 {
 						reg = <5>;
 						label = "eth_cu_1000_4";
 					};
 
-					ethernet-port@6 {
+					port@6 {
 						reg = <6>;
 						label = "eth_cu_1000_7";
 					};
 
-					ethernet-port@7 {
+					port@7 {
 						reg = <7>;
 						label = "modem_pic";
 
@@ -108,7 +108,7 @@
 						};
 					};
 
-					switch0port10: ethernet-port@10 {
+					switch0port10: port@10 {
 						reg = <10>;
 						label = "dsa";
 						phy-mode = "xgmii";
@@ -130,32 +130,32 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			switch1: ethernet-switch@0 {
+			switch1: switch1@0 {
 				compatible = "marvell,mv88e6190";
 				reg = <0>;
 				dsa,member = <0 1>;
 				eeprom-length = <65536>;
 
-				ethernet-ports {
+				ports {
 					#address-cells = <1>;
 					#size-cells = <0>;
 
-					ethernet-port@1 {
+					port@1 {
 						reg = <1>;
 						label = "eth_cu_1000_3";
 					};
 
-					ethernet-port@2 {
+					port@2 {
 						reg = <2>;
 						label = "eth_cu_100_2";
 					};
 
-					ethernet-port@3 {
+					port@3 {
 						reg = <3>;
 						label = "eth_cu_100_3";
 					};
 
-					switch1port9: ethernet-port@9 {
+					switch1port9: port@9 {
 						reg = <9>;
 						label = "dsa";
 						phy-mode = "xgmii";
@@ -168,7 +168,7 @@
 						};
 					};
 
-					switch1port10: ethernet-port@10 {
+					switch1port10: port@10 {
 						reg = <10>;
 						label = "dsa";
 						phy-mode = "xgmii";
@@ -188,17 +188,17 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			switch2: ethernet-switch@0 {
+			switch2: switch2@0 {
 				compatible = "marvell,mv88e6190";
 				reg = <0>;
 				dsa,member = <0 2>;
 				eeprom-length = <65536>;
 
-				ethernet-ports {
+				ports {
 					#address-cells = <1>;
 					#size-cells = <0>;
 
-					ethernet-port@2 {
+					port@2 {
 						reg = <2>;
 						label = "eth_fc_1000_2";
 						phy-mode = "1000base-x";
@@ -206,7 +206,7 @@
 						sfp = <&sff1>;
 					};
 
-					ethernet-port@3 {
+					port@3 {
 						reg = <3>;
 						label = "eth_fc_1000_3";
 						phy-mode = "1000base-x";
@@ -214,7 +214,7 @@
 						sfp = <&sff2>;
 					};
 
-					ethernet-port@4 {
+					port@4 {
 						reg = <4>;
 						label = "eth_fc_1000_4";
 						phy-mode = "1000base-x";
@@ -222,7 +222,7 @@
 						sfp = <&sff3>;
 					};
 
-					ethernet-port@5 {
+					port@5 {
 						reg = <5>;
 						label = "eth_fc_1000_5";
 						phy-mode = "1000base-x";
@@ -230,7 +230,7 @@
 						sfp = <&sff4>;
 					};
 
-					ethernet-port@6 {
+					port@6 {
 						reg = <6>;
 						label = "eth_fc_1000_6";
 						phy-mode = "1000base-x";
@@ -238,7 +238,7 @@
 						sfp = <&sff5>;
 					};
 
-					ethernet-port@7 {
+					port@7 {
 						reg = <7>;
 						label = "eth_fc_1000_7";
 						phy-mode = "1000base-x";
@@ -246,7 +246,7 @@
 						sfp = <&sff6>;
 					};
 
-					ethernet-port@9 {
+					port@9 {
 						reg = <9>;
 						label = "eth_fc_1000_1";
 						phy-mode = "1000base-x";
@@ -254,7 +254,7 @@
 						sfp = <&sff0>;
 					};
 
-					switch2port10: ethernet-port@10 {
+					switch2port10: port@10 {
 						reg = <10>;
 						label = "dsa";
 						phy-mode = "2500base-x";
@@ -276,17 +276,17 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			switch3: ethernet-switch@0 {
+			switch3: switch3@0 {
 				compatible = "marvell,mv88e6190";
 				reg = <0>;
 				dsa,member = <0 3>;
 				eeprom-length = <65536>;
 
-				ethernet-ports {
+				ports {
 					#address-cells = <1>;
 					#size-cells = <0>;
 
-					ethernet-port@2 {
+					port@2 {
 						reg = <2>;
 						label = "eth_fc_1000_8";
 						phy-mode = "1000base-x";
@@ -294,7 +294,7 @@
 						sfp = <&sff7>;
 					};
 
-					ethernet-port@3 {
+					port@3 {
 						reg = <3>;
 						label = "eth_fc_1000_9";
 						phy-mode = "1000base-x";
@@ -302,7 +302,7 @@
 						sfp = <&sff8>;
 					};
 
-					ethernet-port@4 {
+					port@4 {
 						reg = <4>;
 						label = "eth_fc_1000_10";
 						phy-mode = "1000base-x";
@@ -310,7 +310,7 @@
 						sfp = <&sff9>;
 					};
 
-					switch3port9: ethernet-port@9 {
+					switch3port9: port@9 {
 						reg = <9>;
 						label = "dsa";
 						phy-mode = "2500base-x";
@@ -322,7 +322,7 @@
 						};
 					};
 
-					switch3port10: ethernet-port@10 {
+					switch3port10: 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 2a490464660c..1461804ecaea 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 @@
 		suppress-preamble;
 		status = "okay";
 
-		switch0: ethernet-switch@0 {
+		switch0: switch0@0 {
 			compatible = "marvell,mv88e6190";
 			pinctrl-0 = <&pinctrl_gpio_switch0>;
 			pinctrl-names = "default";
@@ -134,11 +134,11 @@
 			interrupt-controller;
 			#interrupt-cells = <2>;
 
-			ethernet-ports {
+			ports {
 				#address-cells = <1>;
 				#size-cells = <0>;
 
-				ethernet-port@0 {
+				port@0 {
 					reg = <0>;
 					phy-mode = "rmii";
 					ethernet = <&fec1>;
@@ -149,32 +149,32 @@
 					};
 				};
 
-				ethernet-port@1 {
+				port@1 {
 					reg = <1>;
 					label = "eth_cu_1000_1";
 				};
 
-				ethernet-port@2 {
+				port@2 {
 					reg = <2>;
 					label = "eth_cu_1000_2";
 				};
 
-				ethernet-port@3 {
+				port@3 {
 					reg = <3>;
 					label = "eth_cu_1000_3";
 				};
 
-				ethernet-port@4 {
+				port@4 {
 					reg = <4>;
 					label = "eth_cu_1000_4";
 				};
 
-				ethernet-port@5 {
+				port@5 {
 					reg = <5>;
 					label = "eth_cu_1000_5";
 				};
 
-				ethernet-port@6 {
+				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 078d8699e16d..463c2452b9b7 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 @@
 		suppress-preamble;
 		status = "okay";
 
-		switch0: ethernet-switch@0 {
+		switch0: switch0@0 {
 			compatible = "marvell,mv88e6190";
 			pinctrl-0 = <&pinctrl_gpio_switch0>;
 			pinctrl-names = "default";
@@ -123,11 +123,11 @@
 			interrupt-controller;
 			#interrupt-cells = <2>;
 
-			ethernet-ports {
+			ports {
 				#address-cells = <1>;
 				#size-cells = <0>;
 
-				ethernet-port@0 {
+				port@0 {
 					reg = <0>;
 					phy-mode = "rmii";
 					ethernet = <&fec1>;
@@ -138,27 +138,27 @@
 					};
 				};
 
-				ethernet-port@1 {
+				port@1 {
 					reg = <1>;
 					label = "eth_cu_100_3";
 				};
 
-				ethernet-port@5 {
+				port@5 {
 					reg = <5>;
 					label = "eth_cu_1000_4";
 				};
 
-				ethernet-port@6 {
+				port@6 {
 					reg = <6>;
 					label = "eth_cu_1000_5";
 				};
 
-				ethernet-port@8 {
+				port@8 {
 					reg = <8>;
 					label = "eth_cu_1000_1";
 				};
 
-				ethernet-port@9 {
+				port@9 {
 					reg = <9>;
 					label = "eth_cu_1000_2";
 					phy-handle = <&phy9>;
@@ -167,12 +167,12 @@
 				};
 			};
 
-			mdio-external {
+			mdio1 {
 				compatible = "marvell,mv88e6xxx-mdio-external";
 				#address-cells = <1>;
 				#size-cells = <0>;
 
-				phy9: ethernet-phy@0 {
+				phy9: phy9@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 22c8f44390a9..f5ae0d5de315 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 @@
 		suppress-preamble;
 		status = "okay";
 
-		switch0: ethernet-switch@0 {
+		switch0: switch0@0 {
 			compatible = "marvell,mv88e6190";
 			pinctrl-0 = <&pinctrl_gpio_switch0>;
 			pinctrl-names = "default";
@@ -148,11 +148,11 @@
 			interrupt-controller;
 			#interrupt-cells = <2>;
 
-			ethernet-ports {
+			ports {
 				#address-cells = <1>;
 				#size-cells = <0>;
 
-				ethernet-port@0 {
+				port@0 {
 					reg = <0>;
 					phy-mode = "rmii";
 					ethernet = <&fec1>;
@@ -163,32 +163,32 @@
 					};
 				};
 
-				ethernet-port@1 {
+				port@1 {
 					reg = <1>;
 					label = "eth_cu_1000_1";
 				};
 
-				ethernet-port@2 {
+				port@2 {
 					reg = <2>;
 					label = "eth_cu_1000_2";
 				};
 
-				ethernet-port@3 {
+				port@3 {
 					reg = <3>;
 					label = "eth_cu_1000_3";
 				};
 
-				ethernet-port@4 {
+				port@4 {
 					reg = <4>;
 					label = "eth_cu_1000_4";
 				};
 
-				ethernet-port@5 {
+				port@5 {
 					reg = <5>;
 					label = "eth_cu_1000_5";
 				};
 
-				ethernet-port@6 {
+				port@6 {
 					reg = <6>;
 					label = "eth_cu_1000_6";
 				};