From 98b547becfd2261b7ee25457850c61d06d38c741 Mon Sep 17 00:00:00 2001
From: Ziyang Huang <hzyitc@outlook.com>
Date: Sun, 19 Oct 2025 19:48:41 +0800
Subject: [PATCH] airoha: an7581: change switch node to mt7621 style

This should be easier to read

Signed-off-by: Ziyang Huang <hzyitc@outlook.com>
---
 target/linux/airoha/dts/an7581-evb-emmc.dts | 116 +++++++++++---------
 target/linux/airoha/dts/an7581-evb.dts      | 116 +++++++++++---------
 2 files changed, 128 insertions(+), 104 deletions(-)

diff --git a/target/linux/airoha/dts/an7581-evb-emmc.dts b/target/linux/airoha/dts/an7581-evb-emmc.dts
index fab3e3a8a3..0aff7e2bca 100644
--- a/target/linux/airoha/dts/an7581-evb-emmc.dts
+++ b/target/linux/airoha/dts/an7581-evb-emmc.dts
@@ -233,68 +233,80 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&mdio_pins>;
 	status = "okay";
-};
 
-&gsw_port1 {
-	status = "okay";
-	label = "lan1";
-};
+	ports {
+		port@1 {
+			status = "okay";
+			label = "lan1";
+		};
 
-&gsw_phy1 {
-	pinctrl-names = "gbe-led";
-	pinctrl-0 = <&gswp1_led0_pins>;
-	status = "okay";
-};
+		port@2 {
+			status = "okay";
+			label = "lan2";
+		};
 
-&gsw_phy1_led0 {
-	status = "okay";
-	function = LED_FUNCTION_LAN;
-};
+		port@3 {
+			status = "okay";
+			label = "lan3";
+		};
 
-&gsw_port2 {
-	status = "okay";
-	label = "lan2";
-};
+		port@4 {
+			status = "okay";
+			label = "lan4";
+		};
+	};
 
-&gsw_phy2 {
-	pinctrl-names = "gbe-led";
-	pinctrl-0 = <&gswp2_led0_pins>;
-	status = "okay";
-};
+	mdio {
+		ethernet-phy@9 {
+			status = "okay";
+			pinctrl-names = "gbe-led";
+			pinctrl-0 = <&gswp1_led0_pins>;
 
-&gsw_phy2_led0 {
-	status = "okay";
-	function = LED_FUNCTION_LAN;
-};
+			leds {
+				led@0 {
+					status = "okay";
+					function = LED_FUNCTION_LAN;
+				};
+			};
+		};
 
-&gsw_port3 {
-	status = "okay";
-	label = "lan3";
-};
+		ethernet-phy@a {
+			status = "okay";
+			pinctrl-names = "gbe-led";
+			pinctrl-0 = <&gswp2_led0_pins>;
 
-&gsw_phy3 {
-	pinctrl-names = "gbe-led";
-	pinctrl-0 = <&gswp3_led0_pins>;
-	status = "okay";
-};
+			leds {
+				led@0 {
+					status = "okay";
+					function = LED_FUNCTION_LAN;
+				};
+			};
+		};
 
-&gsw_phy3_led0 {
-	status = "okay";
-	function = LED_FUNCTION_LAN;
-};
+		ethernet-phy@b {
+			status = "okay";
+			pinctrl-names = "gbe-led";
+			pinctrl-0 = <&gswp3_led0_pins>;
 
-&gsw_port4 {
-	status = "okay";
-	label = "lan4";
-};
+			leds {
+				led@0 {
+					status = "okay";
+					function = LED_FUNCTION_LAN;
+				};
+			};
+		};
 
-&gsw_phy4 {
-	pinctrl-names = "gbe-led";
-	pinctrl-0 = <&gswp4_led0_pins>;
-	status = "okay";
-};
+		ethernet-phy@c {
+			status = "okay";
+			pinctrl-names = "gbe-led";
+			pinctrl-0 = <&gswp4_led0_pins>;
 
-&gsw_phy4_led0 {
-	status = "okay";
-	function = LED_FUNCTION_LAN;
+			leds {
+				led@0 {
+					status = "okay";
+					function = LED_FUNCTION_LAN;
+				};
+			};
+		};
+	};
 };
diff --git a/target/linux/airoha/dts/an7581-evb.dts b/target/linux/airoha/dts/an7581-evb.dts
index 9ab54a8394..e20aae1c37 100644
--- a/target/linux/airoha/dts/an7581-evb.dts
+++ b/target/linux/airoha/dts/an7581-evb.dts
@@ -216,68 +216,80 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&mdio_pins>;
 	status = "okay";
-};
 
-&gsw_port1 {
-	status = "okay";
-	label = "lan1";
-};
+	ports {
+		port@1 {
+			status = "okay";
+			label = "lan1";
+		};
 
-&gsw_phy1 {
-	pinctrl-names = "gbe-led";
-	pinctrl-0 = <&gswp1_led0_pins>;
-	status = "okay";
-};
+		port@2 {
+			status = "okay";
+			label = "lan2";
+		};
 
-&gsw_phy1_led0 {
-	status = "okay";
-	function = LED_FUNCTION_LAN;
-};
+		port@3 {
+			status = "okay";
+			label = "lan3";
+		};
 
-&gsw_port2 {
-	status = "okay";
-	label = "lan2";
-};
+		port@4 {
+			status = "okay";
+			label = "lan4";
+		};
+	};
 
-&gsw_phy2 {
-	pinctrl-names = "gbe-led";
-	pinctrl-0 = <&gswp2_led0_pins>;
-	status = "okay";
-};
+	mdio {
+		ethernet-phy@9 {
+			status = "okay";
+			pinctrl-names = "gbe-led";
+			pinctrl-0 = <&gswp1_led0_pins>;
 
-&gsw_phy2_led0 {
-	status = "okay";
-	function = LED_FUNCTION_LAN;
-};
+			leds {
+				led@0 {
+					status = "okay";
+					function = LED_FUNCTION_LAN;
+				};
+			};
+		};
 
-&gsw_port3 {
-	status = "okay";
-	label = "lan3";
-};
+		ethernet-phy@a {
+			status = "okay";
+			pinctrl-names = "gbe-led";
+			pinctrl-0 = <&gswp2_led0_pins>;
 
-&gsw_phy3 {
-	pinctrl-names = "gbe-led";
-	pinctrl-0 = <&gswp3_led0_pins>;
-	status = "okay";
-};
+			leds {
+				led@0 {
+					status = "okay";
+					function = LED_FUNCTION_LAN;
+				};
+			};
+		};
 
-&gsw_phy3_led0 {
-	status = "okay";
-	function = LED_FUNCTION_LAN;
-};
+		ethernet-phy@b {
+			status = "okay";
+			pinctrl-names = "gbe-led";
+			pinctrl-0 = <&gswp3_led0_pins>;
 
-&gsw_port4 {
-	status = "okay";
-	label = "lan4";
-};
+			leds {
+				led@0 {
+					status = "okay";
+					function = LED_FUNCTION_LAN;
+				};
+			};
+		};
 
-&gsw_phy4 {
-	pinctrl-names = "gbe-led";
-	pinctrl-0 = <&gswp4_led0_pins>;
-	status = "okay";
-};
+		ethernet-phy@c {
+			status = "okay";
+			pinctrl-names = "gbe-led";
+			pinctrl-0 = <&gswp4_led0_pins>;
 
-&gsw_phy4_led0 {
-	status = "okay";
-	function = LED_FUNCTION_LAN;
+			leds {
+				led@0 {
+					status = "okay";
+					function = LED_FUNCTION_LAN;
+				};
+			};
+		};
+	};
 };