From: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Date: Tue, 30 Jun 2026 12:56:16 +0000 (+0200)
Subject: airoha: an7583: move the switch port label from soc-level to board-level
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce55cdde26a932b7c06b2af8e6d33a8b58a7d25c;p=thirdparty%2Fopenwrt.git

airoha: an7583: move the switch port label from soc-level to board-level

Different boards use different port maps. Defining the port labels in
board-level is better.

Signed-off-by: Ziyang Huang <hzyitc@outlook.com>
[ adapted from commit e2f7ad08c765 ("airoha: move the switch port label from soc-level to ...-") ]
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/24264
Signed-off-by: Robert Marko <robimarko@gmail.com>
---

diff --git a/target/linux/airoha/dts/an7583-evb-emmc.dts b/target/linux/airoha/dts/an7583-evb-emmc.dts
index 62e9f3495d7..f8ce387efaa 100644
--- a/target/linux/airoha/dts/an7583-evb-emmc.dts
+++ b/target/linux/airoha/dts/an7583-evb-emmc.dts
@@ -258,6 +258,7 @@
 
 &gsw_port1 {
 	status = "okay";
+	label = "lan1";
 };
 
 &gsw_phy1 {
@@ -273,6 +274,7 @@
 
 &gsw_port2 {
 	status = "okay";
+	label = "lan2";
 };
 
 &gsw_phy2 {
@@ -288,6 +290,7 @@
 
 &gsw_port3 {
 	status = "okay";
+	label = "lan3";
 };
 
 &gsw_phy3 {
@@ -303,6 +306,7 @@
 
 &gsw_port4 {
 	status = "okay";
+	label = "lan4";
 };
 
 &gsw_phy4 {
diff --git a/target/linux/airoha/dts/an7583-evb.dts b/target/linux/airoha/dts/an7583-evb.dts
index e9a08eea8da..5cbf4828709 100644
--- a/target/linux/airoha/dts/an7583-evb.dts
+++ b/target/linux/airoha/dts/an7583-evb.dts
@@ -115,6 +115,7 @@
 
 &gsw_port1 {
 	status = "okay";
+	label = "lan1";
 };
 
 &gsw_phy1 {
diff --git a/target/linux/airoha/dts/an7583.dtsi b/target/linux/airoha/dts/an7583.dtsi
index 868afaea0e0..c7d3bcd6457 100644
--- a/target/linux/airoha/dts/an7583.dtsi
+++ b/target/linux/airoha/dts/an7583.dtsi
@@ -707,7 +707,6 @@
 
 				gsw_port1: port@1 {
 					reg = <1>;
-					label = "lan1";
 					phy-mode = "internal";
 					phy-handle = <&gsw_phy1>;
 					status = "disabled";
@@ -715,7 +714,6 @@
 
 				gsw_port2: port@2 {
 					reg = <2>;
-					label = "lan2";
 					phy-mode = "internal";
 					phy-handle = <&gsw_phy2>;
 					status = "disabled";
@@ -723,7 +721,6 @@
 
 				gsw_port3: port@3 {
 					reg = <3>;
-					label = "lan3";
 					phy-mode = "internal";
 					phy-handle = <&gsw_phy3>;
 					status = "disabled";
@@ -731,7 +728,6 @@
 
 				gsw_port4: port@4 {
 					reg = <4>;
-					label = "lan4";
 					phy-mode = "internal";
 					phy-handle = <&gsw_phy4>;
 					status = "disabled";
@@ -739,7 +735,6 @@
 
 				port@6 {
 					reg = <6>;
-					label = "cpu";
 					ethernet = <&gdm1>;
 					phy-mode = "internal";