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>

1 files changed, 11 insertions, 9 deletions

diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
index fed2dcecb323..49cbdb55b4b3 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
@@ -145,17 +145,19 @@
 };
 
 &mdio {
-	switch0: ethernet-switch@1 {
+	switch0: switch0@1 {
 		compatible = "marvell,mv88e6085";
+		#address-cells = <1>;
+		#size-cells = <0>;
 		reg = <1>;
 
 		dsa,member = <0 0>;
 
-		ethernet-ports {
+		ports {
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			switch0port0: ethernet-port@0 {
+			switch0port0: port@0 {
 				reg = <0>;
 				label = "cpu";
 				ethernet = <&eth0>;
@@ -166,19 +168,19 @@
 				};
 			};
 
-			switch0port1: ethernet-port@1 {
+			switch0port1: port@1 {
 				reg = <1>;
 				label = "wan";
 				phy-handle = <&switch0phy0>;
 			};
 
-			switch0port2: ethernet-port@2 {
+			switch0port2: port@2 {
 				reg = <2>;
 				label = "lan0";
 				phy-handle = <&switch0phy1>;
 			};
 
-			switch0port3: ethernet-port@3 {
+			switch0port3: port@3 {
 				reg = <3>;
 				label = "lan1";
 				phy-handle = <&switch0phy2>;
@@ -190,13 +192,13 @@
 			#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>;
 			};
 		};