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>

diff --git a/target/linux/airoha/dts/an7581-evb-emmc.dts b/target/linux/airoha/dts/an7581-evb-emmc.dts
index c2709c4264f7db8e8536bfb6d7ba2560de6f1d00..554d05b7786040a922d8b0b826c48caec175c10c 100644 (file)
--- a/target/linux/airoha/dts/an7581-evb-emmc.dts
+++ b/target/linux/airoha/dts/an7581-evb-emmc.dts
@@ -255,6 +255,7 @@
 
 &gsw_port1 {
        status = "okay";
+       label = "lan1";
 };
 
 &gsw_phy1 {
@@ -269,6 +270,7 @@
 
 &gsw_port2 {
        status = "okay";
+       label = "lan2";
 };
 
 &gsw_phy2 {
@@ -283,6 +285,7 @@
 
 &gsw_port3 {
        status = "okay";
+       label = "lan3";
 };
 
 &gsw_phy3 {
@@ -297,6 +300,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 8dcdce2a275b92f85633e3c9243051c146ba2689..7e22f0ce7551db7533a38858d866dab1fece54cd 100644 (file)
--- 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 2f61a2c2f42f1ae51e059ace5ce72e542544faa2..25ff26af7dc0f17c268a4a1ef421a0daefa91b11 100644 (file)
--- a/target/linux/airoha/dts/an7581.dtsi
+++ b/target/linux/airoha/dts/an7581.dtsi
@@ -942,7 +942,6 @@
 
                                gsw_port1: port@1 {
                                        reg = <1>;
-                                       label = "lan1";
                                        phy-mode = "internal";
                                        phy-handle = <&gsw_phy1>;
                                        status = "disabled";
@@ -950,7 +949,6 @@
 
                                gsw_port2: port@2 {
                                        reg = <2>;
-                                       label = "lan2";
                                        phy-mode = "internal";
                                        phy-handle = <&gsw_phy2>;
                                        status = "disabled";
@@ -958,7 +956,6 @@
 
                                gsw_port3: port@3 {
                                        reg = <3>;
-                                       label = "lan3";
                                        phy-mode = "internal";
                                        phy-handle = <&gsw_phy3>;
                                        status = "disabled";
@@ -966,7 +963,6 @@
 
                                gsw_port4: port@4 {
                                        reg = <4>;
-                                       label = "lan4";
                                        phy-mode = "internal";
                                        phy-handle = <&gsw_phy4>;
                                        status = "disabled";
@@ -974,7 +970,6 @@
 
                                port@6 {
                                        reg = <6>;
-                                       label = "cpu";
                                        ethernet = <&gdm1>;
                                        phy-mode = "internal";