From 90b84588082233019268ab14c6ab60727756159a Mon Sep 17 00:00:00 2001
From: Ziyang Huang <hzyitc@outlook.com>
Date: Sun, 19 Oct 2025 17:37:39 +0800
Subject: [PATCH] airoha: an7581: move the switch port label from soc-level to
 board-level

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

Signed-off-by: Ziyang Huang <hzyitc@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/20482
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit e2f7ad08c76593c8cb5abb70088b0813005aa09c)
---
 target/linux/airoha/dts/an7581-evb-emmc.dts | 4 ++++
 target/linux/airoha/dts/an7581-evb.dts      | 4 ++++
 target/linux/airoha/dts/an7581.dtsi         | 5 -----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/target/linux/airoha/dts/an7581-evb-emmc.dts b/target/linux/airoha/dts/an7581-evb-emmc.dts
index 00e269a576..8ff0170711 100644
--- a/target/linux/airoha/dts/an7581-evb-emmc.dts
+++ b/target/linux/airoha/dts/an7581-evb-emmc.dts
@@ -237,6 +237,7 @@
 
 &gsw_port1 {
 	status = "okay";
+	label = "lan1";
 };
 
 &gsw_phy1 {
@@ -251,6 +252,7 @@
 
 &gsw_port2 {
 	status = "okay";
+	label = "lan2";
 };
 
 &gsw_phy2 {
@@ -265,6 +267,7 @@
 
 &gsw_port3 {
 	status = "okay";
+	label = "lan3";
 };
 
 &gsw_phy3 {
@@ -279,6 +282,7 @@
 
 &gsw_port4 {
 	status = "okay";
+	label = "lan4";
 };
 
 &gsw_phy4 {
diff --git a/target/linux/airoha/dts/an7581-evb.dts b/target/linux/airoha/dts/an7581-evb.dts
index a5b20c3fcf..168881cd9d 100644
--- a/target/linux/airoha/dts/an7581-evb.dts
+++ b/target/linux/airoha/dts/an7581-evb.dts
@@ -220,6 +220,7 @@
 
 &gsw_port1 {
 	status = "okay";
+	label = "lan1";
 };
 
 &gsw_phy1 {
@@ -234,6 +235,7 @@
 
 &gsw_port2 {
 	status = "okay";
+	label = "lan2";
 };
 
 &gsw_phy2 {
@@ -248,6 +250,7 @@
 
 &gsw_port3 {
 	status = "okay";
+	label = "lan3";
 };
 
 &gsw_phy3 {
@@ -262,6 +265,7 @@
 
 &gsw_port4 {
 	status = "okay";
+	label = "lan4";
 };
 
 &gsw_phy4 {
diff --git a/target/linux/airoha/dts/an7581.dtsi b/target/linux/airoha/dts/an7581.dtsi
index 081d45983b..8de16e4a95 100644
--- a/target/linux/airoha/dts/an7581.dtsi
+++ b/target/linux/airoha/dts/an7581.dtsi
@@ -926,7 +926,6 @@
 
 				gsw_port1: port@1 {
 					reg = <1>;
-					label = "lan1";
 					phy-mode = "internal";
 					phy-handle = <&gsw_phy1>;
 					status = "disabled";
@@ -934,7 +933,6 @@
 
 				gsw_port2: port@2 {
 					reg = <2>;
-					label = "lan2";
 					phy-mode = "internal";
 					phy-handle = <&gsw_phy2>;
 					status = "disabled";
@@ -942,7 +940,6 @@
 
 				gsw_port3: port@3 {
 					reg = <3>;
-					label = "lan3";
 					phy-mode = "internal";
 					phy-handle = <&gsw_phy3>;
 					status = "disabled";
@@ -950,7 +947,6 @@
 
 				gsw_port4: port@4 {
 					reg = <4>;
-					label = "lan4";
 					phy-mode = "internal";
 					phy-handle = <&gsw_phy4>;
 					status = "disabled";
@@ -958,7 +954,6 @@
 
 				port@6 {
 					reg = <6>;
-					label = "cpu";
 					ethernet = <&gdm1>;
 					phy-mode = "internal";