realtek: dts: rtl93xx: use SWITCH_PORT_SFP for ports

Make use of the SWITCH_PORT_SFP macro to simplify and make the DTS of
several devices cleaner.

Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/23118
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/realtek/dts/rtl9301_linksys_lgs328c.dts b/target/linux/realtek/dts/rtl9301_linksys_lgs328c.dts
index f9b4d7359614c1897c149772cad278fa30d3b093..f482551b3aeeb8f4e3643fe959be9abadf467537 100644 (file)
--- a/target/linux/realtek/dts/rtl9301_linksys_lgs328c.dts
+++ b/target/linux/realtek/dts/rtl9301_linksys_lgs328c.dts
@@ -130,38 +130,10 @@
                SWITCH_PORT_SDS(22, 23, 3, usxgmii)
                SWITCH_PORT_SDS(23, 24, 3, usxgmii)
 
-               port@24 {
-                       reg = <24>;
-                       label = "lan25";
-                       pcs-handle = <&serdes4>;
-                       phy-mode = "1000base-x";
-                       managed = "in-band-status";
-                       sfp = <&sfp0>;
-               };
-               port@25 {
-                       reg = <25>;
-                       label = "lan26";
-                       pcs-handle = <&serdes6>;
-                       phy-mode = "1000base-x";
-                       managed = "in-band-status";
-                       sfp = <&sfp1>;
-               };
-               port@26 {
-                       reg = <26>;
-                       label = "lan27";
-                       pcs-handle = <&serdes8>;
-                       phy-mode = "1000base-x";
-                       managed = "in-band-status";
-                       sfp = <&sfp2>;
-               };
-               port@27 {
-                       reg = <27>;
-                       label = "lan28";
-                       pcs-handle = <&serdes9>;
-                       phy-mode = "1000base-x";
-                       managed = "in-band-status";
-                       sfp = <&sfp3>;
-               };
+               SWITCH_PORT_SFP(24, 25, 4, 0, 0)
+               SWITCH_PORT_SFP(25, 26, 6, 0, 1)
+               SWITCH_PORT_SFP(26, 27, 8, 0, 2)
+               SWITCH_PORT_SFP(27, 28, 9, 0, 3)
 
                port@28 {
                        reg = <28>;

diff --git a/target/linux/realtek/dts/rtl9302_plasmacloud_mcx3.dts b/target/linux/realtek/dts/rtl9302_plasmacloud_mcx3.dts
index 02ad74c8c4566b32dc8fa072dc7eb73e76837ad4..c2429b71e101176d186c4559584b028c40dcc41d 100644 (file)
--- a/target/linux/realtek/dts/rtl9302_plasmacloud_mcx3.dts
+++ b/target/linux/realtek/dts/rtl9302_plasmacloud_mcx3.dts
@@ -167,18 +167,7 @@
                SWITCH_PORT_SDS(0, 2, 2, 10g-qxgmii)
                SWITCH_PORT_SDS(1, 1, 2, 10g-qxgmii)
 
-               port@26 {
-                       reg = <26>;
-                       label = "lan3";
-                       pcs-handle = <&serdes8>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp0>;
-                       led-set = <0>;
-                       managed = "in-band-status";
-
-                       nvmem-cells = <&macaddr_ubootenv_ethaddr 3>;
-                       nvmem-cell-names = "mac-address";
-               };
+               SWITCH_PORT_SFP(26, 3, 8, 0, 0)
 
                /* CPU-port */
                port@28 {
@@ -202,3 +191,8 @@
        nvmem-cells = <&macaddr_ubootenv_ethaddr 1>;
        nvmem-cell-names = "mac-address";
 };
+
+&port26 {
+       nvmem-cells = <&macaddr_ubootenv_ethaddr 3>;
+       nvmem-cell-names = "mac-address";
+};

diff --git a/target/linux/realtek/dts/rtl9302_plasmacloud_psx10.dts b/target/linux/realtek/dts/rtl9302_plasmacloud_psx10.dts
index e046749e94364907189874d67229bfab8c3e220b..a3791363b00d2c768decd4e03be095b9ee11cf17 100644 (file)
--- a/target/linux/realtek/dts/rtl9302_plasmacloud_psx10.dts
+++ b/target/linux/realtek/dts/rtl9302_plasmacloud_psx10.dts
@@ -37,30 +37,17 @@
 
 &switch0 {
        ethernet-ports {
-               port@26 {
-                       reg = <26>;
-                       label = "lan9";
-                       pcs-handle = <&serdes8>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp0>;
-                       led-set = <0>;
-                       managed = "in-band-status";
-
-                       nvmem-cells = <&macaddr_ubootenv_ethaddr 9>;
-                       nvmem-cell-names = "mac-address";
-               };
+               SWITCH_PORT_SFP(26, 9, 8, 0, 0)
+               SWITCH_PORT_SFP(27, 10, 9, 0, 1)
+       };
+};
 
-               port@27 {
-                       reg = <27>;
-                       label = "lan10";
-                       pcs-handle = <&serdes9>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp1>;
-                       led-set = <0>;
-                       managed = "in-band-status";
+&port26 {
+       nvmem-cells = <&macaddr_ubootenv_ethaddr 9>;
+       nvmem-cell-names = "mac-address";
+};
 
-                       nvmem-cells = <&macaddr_ubootenv_ethaddr 10>;
-                       nvmem-cell-names = "mac-address";
-               };
-       };
+&port27 {
+       nvmem-cells = <&macaddr_ubootenv_ethaddr 10>;
+       nvmem-cell-names = "mac-address";
 };

diff --git a/target/linux/realtek/dts/rtl9302_xikestor_sks8300-12e2t2x.dts b/target/linux/realtek/dts/rtl9302_xikestor_sks8300-12e2t2x.dts
index 37a1ea48976a6c5a30b85f31cc8bc4adf8fcaf95..cc205289b991e39eb5cf05ae99e4e4d07a129dcc 100644 (file)
--- a/target/linux/realtek/dts/rtl9302_xikestor_sks8300-12e2t2x.dts
+++ b/target/linux/realtek/dts/rtl9302_xikestor_sks8300-12e2t2x.dts
@@ -302,24 +302,8 @@
                        phy-mode = "usxgmii";
                };
 
-               port@26 {
-                       reg = <26>;
-                       label = "lan15";
-                       led-set = <1>;
-                       pcs-handle = <&serdes8>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp0>;
-                       managed = "in-band-status";
-               };
-               port@27 {
-                       reg = <27>;
-                       label = "lan16";
-                       led-set = <1>;
-                       pcs-handle = <&serdes9>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp1>;
-                       managed = "in-band-status";
-               };
+               SWITCH_PORT_SFP(26, 15, 8, 1, 0)
+               SWITCH_PORT_SFP(27, 16, 9, 1, 1)
 
                port@28 {
                        reg = <28>;

diff --git a/target/linux/realtek/dts/rtl9302_zyxel_xgs1250-12-common.dtsi b/target/linux/realtek/dts/rtl9302_zyxel_xgs1250-12-common.dtsi
index 8dcccfac1f34e6ee95f8f1ff3ba5494afe790d70..bad08f29a63545a5840de0419a7095e4719869c6 100644 (file)
--- a/target/linux/realtek/dts/rtl9302_zyxel_xgs1250-12-common.dtsi
+++ b/target/linux/realtek/dts/rtl9302_zyxel_xgs1250-12-common.dtsi
@@ -273,15 +273,7 @@
                SWITCH_PORT_LED(25, 10, 7, 1, usxgmii)
                SWITCH_PORT_LED(26, 11, 8, 1, usxgmii)
 
-               port27: port@27 {
-                       reg = <27>;
-                       label = "lan12";
-                       pcs-handle = <&serdes9>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp0>;
-                       led-set = <2>;
-                       managed = "in-band-status";
-               };
+               SWITCH_PORT_SFP(27, 12, 9, 2, 0)
 
                port@28 {
                        ethernet = <&ethernet0>;

diff --git a/target/linux/realtek/dts/rtl9302_zyxel_xgs1x10-12-common.dtsi b/target/linux/realtek/dts/rtl9302_zyxel_xgs1x10-12-common.dtsi
index efa39179a45cb5f7eb8a842d5feb50aaeea78d69..4b356d9e8ae9a02ba872a1612c2110c30b098dfd 100644 (file)
--- a/target/linux/realtek/dts/rtl9302_zyxel_xgs1x10-12-common.dtsi
+++ b/target/linux/realtek/dts/rtl9302_zyxel_xgs1x10-12-common.dtsi
@@ -157,25 +157,8 @@
                        managed = "in-band-status";
                };
 
-               port@26 {
-                       reg = <26>;
-                       label = "lan11";
-                       pcs-handle = <&serdes8>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp0>;
-                       led-set = <2>;
-                       managed = "in-band-status";
-               };
-
-               port@27 {
-                       reg = <27>;
-                       label = "lan12";
-                       pcs-handle = <&serdes9>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp1>;
-                       led-set = <2>;
-                       managed = "in-band-status";
-               };
+               SWITCH_PORT_SFP(26, 11, 8, 2, 0)
+               SWITCH_PORT_SFP(27, 12, 9, 2, 1)
 
                port@28 {
                        ethernet = <&ethernet0>;

diff --git a/target/linux/realtek/dts/rtl9303_tplink_tl-st1008f-v2.dts b/target/linux/realtek/dts/rtl9303_tplink_tl-st1008f-v2.dts
index 89517ab4a02008b5985ac6a14c204eb39c0feed8..cd63dc24f33887e6923a02379330eac1c33ad691 100644 (file)
--- a/target/linux/realtek/dts/rtl9303_tplink_tl-st1008f-v2.dts
+++ b/target/linux/realtek/dts/rtl9303_tplink_tl-st1008f-v2.dts
@@ -237,85 +237,14 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               port@0 {
-                       reg = <0>;
-                       label = "lan1";
-                       pcs-handle = <&serdes2>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp0>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@8 {
-                       reg = <8>;
-                       label = "lan2";
-                       pcs-handle = <&serdes3>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp1>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@10 {
-                       reg = <16>;
-                       label = "lan3";
-                       pcs-handle = <&serdes4>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp2>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@14 {
-                       reg = <20>;
-                       label = "lan4";
-                       pcs-handle = <&serdes5>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp3>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@18 {
-                       reg = <24>;
-                       label = "lan5";
-                       pcs-handle = <&serdes6>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp4>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@19 {
-                       reg = <25>;
-                       label = "lan6";
-                       pcs-handle = <&serdes7>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp5>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@1a {
-                       reg = <26>;
-                       label = "lan7";
-                       pcs-handle = <&serdes8>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp6>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@1b {
-                       reg = <27>;
-                       label = "lan8";
-                       pcs-handle = <&serdes9>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp7>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
+               SWITCH_PORT_SFP(0, 1, 2, 0, 0)
+               SWITCH_PORT_SFP(8, 2, 3, 0, 1)
+               SWITCH_PORT_SFP(16, 3, 4, 0, 2)
+               SWITCH_PORT_SFP(20, 4, 5, 0, 3)
+               SWITCH_PORT_SFP(24, 5, 6, 0, 4)
+               SWITCH_PORT_SFP(25, 6, 7, 0, 5)
+               SWITCH_PORT_SFP(26, 7, 8, 0, 6)
+               SWITCH_PORT_SFP(27, 8, 9, 0, 7)
 
                port@1c {
                        ethernet = <&ethernet0>;

diff --git a/target/linux/realtek/dts/rtl9303_vimin_vm-s100-0800ms.dts b/target/linux/realtek/dts/rtl9303_vimin_vm-s100-0800ms.dts
index 39c303d7d9ae0b4334eb865e07b168b16f57e007..282fa554def810147cc6d24066f721c3f68a29ef 100644 (file)
--- a/target/linux/realtek/dts/rtl9303_vimin_vm-s100-0800ms.dts
+++ b/target/linux/realtek/dts/rtl9303_vimin_vm-s100-0800ms.dts
@@ -226,85 +226,14 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               port@0 {
-                       reg = <0>;
-                       label = "lan1";
-                       pcs-handle = <&serdes2>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp0>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@8 {
-                       reg = <8>;
-                       label = "lan2";
-                       pcs-handle = <&serdes3>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp1>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@10 {
-                       reg = <16>;
-                       label = "lan3";
-                       pcs-handle = <&serdes4>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp2>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@14 {
-                       reg = <20>;
-                       label = "lan4";
-                       pcs-handle = <&serdes5>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp3>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@18 {
-                       reg = <24>;
-                       label = "lan5";
-                       pcs-handle = <&serdes6>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp4>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@19 {
-                       reg = <25>;
-                       label = "lan6";
-                       pcs-handle = <&serdes7>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp5>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@1a {
-                       reg = <26>;
-                       label = "lan7";
-                       pcs-handle = <&serdes8>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp6>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@1b {
-                       reg = <27>;
-                       label = "lan8";
-                       pcs-handle = <&serdes9>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp7>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
+               SWITCH_PORT_SFP(0, 1, 2, 0, 0)
+               SWITCH_PORT_SFP(8, 2, 3, 0, 1)
+               SWITCH_PORT_SFP(16, 3, 4, 0, 2)
+               SWITCH_PORT_SFP(20, 4, 5, 0, 3)
+               SWITCH_PORT_SFP(24, 5, 6, 0, 4)
+               SWITCH_PORT_SFP(25, 6, 7, 0, 5)
+               SWITCH_PORT_SFP(26, 7, 8, 0, 6)
+               SWITCH_PORT_SFP(27, 8, 9, 0, 7)
 
                port@1c {
                        ethernet = <&ethernet0>;

diff --git a/target/linux/realtek/dts/rtl9303_xikestor_sks8300-8x.dts b/target/linux/realtek/dts/rtl9303_xikestor_sks8300-8x.dts
index 3b9a89d045c180e5f35794417a71540d8a691e48..fab9cefbda84cf14a07fe18efe781990639d814c 100644 (file)
--- a/target/linux/realtek/dts/rtl9303_xikestor_sks8300-8x.dts
+++ b/target/linux/realtek/dts/rtl9303_xikestor_sks8300-8x.dts
@@ -256,85 +256,14 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               port@0 {
-                       reg = <0>;
-                       label = "lan1";
-                       pcs-handle = <&serdes2>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp0>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@8 {
-                       reg = <8>;
-                       label = "lan2";
-                       pcs-handle = <&serdes3>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp1>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@10 {
-                       reg = <16>;
-                       label = "lan3";
-                       pcs-handle = <&serdes4>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp2>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@14 {
-                       reg = <20>;
-                       label = "lan4";
-                       pcs-handle = <&serdes5>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp3>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@18 {
-                       reg = <24>;
-                       label = "lan5";
-                       pcs-handle = <&serdes6>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp4>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@19 {
-                       reg = <25>;
-                       label = "lan6";
-                       pcs-handle = <&serdes7>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp5>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@1a {
-                       reg = <26>;
-                       label = "lan7";
-                       pcs-handle = <&serdes8>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp6>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@1b {
-                       reg = <27>;
-                       label = "lan8";
-                       pcs-handle = <&serdes9>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp7>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
+               SWITCH_PORT_SFP(0, 1, 2, 0, 0)
+               SWITCH_PORT_SFP(8, 2, 3, 0, 1)
+               SWITCH_PORT_SFP(16, 3, 4, 0, 2)
+               SWITCH_PORT_SFP(20, 4, 5, 0, 3)
+               SWITCH_PORT_SFP(24, 5, 6, 0, 4)
+               SWITCH_PORT_SFP(25, 6, 7, 0, 5)
+               SWITCH_PORT_SFP(26, 7, 8, 0, 6)
+               SWITCH_PORT_SFP(27, 8, 9, 0, 7)
 
                port@1c {
                        ethernet = <&ethernet0>;

diff --git a/target/linux/realtek/dts/rtl9303_xikestor_sks8310-8x.dts b/target/linux/realtek/dts/rtl9303_xikestor_sks8310-8x.dts
index f4de1c8951fb9aebf77ab0d7ad2a23957c87f430..bca93c9c7c190f6097ab302c3935b0c0adc3e9b8 100644 (file)
--- a/target/linux/realtek/dts/rtl9303_xikestor_sks8310-8x.dts
+++ b/target/linux/realtek/dts/rtl9303_xikestor_sks8310-8x.dts
@@ -263,85 +263,14 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               port@0 {
-                       reg = <0>;
-                       label = "lan1";
-                       pcs-handle = <&serdes2>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp0>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@8 {
-                       reg = <8>;
-                       label = "lan2";
-                       pcs-handle = <&serdes3>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp1>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@10 {
-                       reg = <16>;
-                       label = "lan3";
-                       pcs-handle = <&serdes4>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp2>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@14 {
-                       reg = <20>;
-                       label = "lan4";
-                       pcs-handle = <&serdes5>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp3>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@18 {
-                       reg = <24>;
-                       label = "lan5";
-                       pcs-handle = <&serdes6>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp4>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@19 {
-                       reg = <25>;
-                       label = "lan6";
-                       pcs-handle = <&serdes7>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp5>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@1a {
-                       reg = <26>;
-                       label = "lan7";
-                       pcs-handle = <&serdes8>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp6>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
-
-               port@1b {
-                       reg = <27>;
-                       label = "lan8";
-                       pcs-handle = <&serdes9>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp7>;
-                       managed = "in-band-status";
-                       led-set = <0>;
-               };
+               SWITCH_PORT_SFP(0, 1, 2, 0, 0)
+               SWITCH_PORT_SFP(8, 2, 3, 0, 1)
+               SWITCH_PORT_SFP(16, 3, 4, 0, 2)
+               SWITCH_PORT_SFP(20, 4, 5, 0, 3)
+               SWITCH_PORT_SFP(24, 5, 6, 0, 4)
+               SWITCH_PORT_SFP(25, 6, 7, 0, 5)
+               SWITCH_PORT_SFP(26, 7, 8, 0, 6)
+               SWITCH_PORT_SFP(27, 8, 9, 0, 7)
 
                port@1c {
                        ethernet = <&ethernet0>;

diff --git a/target/linux/realtek/dts/rtl9311_linksys_lgs352c.dts b/target/linux/realtek/dts/rtl9311_linksys_lgs352c.dts
index f7e3e21f19a6942109908fd1f0a98a2f79b65b68..5bdb92a4745679ae86e6cb30befed31ada9d7a41 100644 (file)
--- a/target/linux/realtek/dts/rtl9311_linksys_lgs352c.dts
+++ b/target/linux/realtek/dts/rtl9311_linksys_lgs352c.dts
@@ -194,38 +194,10 @@
                SWITCH_PORT_SDS(46, 47, 7, usxgmii)
                SWITCH_PORT_SDS(47, 48, 7, usxgmii)
 
-               port@48 {
-                       reg = <48>;
-                       label = "lan49";
-                       pcs-handle = <&serdes8>;
-                       phy-mode = "1000base-x";
-                       managed = "in-band-status";
-                       sfp = <&sfp0>;
-               };
-               port@50 {
-                       reg = <50>;
-                       label = "lan50";
-                       pcs-handle = <&serdes9>;
-                       phy-mode = "1000base-x";
-                       managed = "in-band-status";
-                       sfp = <&sfp1>;
-               };
-               port@52 {
-                       reg = <52>;
-                       label = "lan51";
-                       pcs-handle = <&serdes10>;
-                       phy-mode = "1000base-x";
-                       managed = "in-band-status";
-                       sfp = <&sfp2>;
-               };
-               port@53 {
-                       reg = <53>;
-                       label = "lan52";
-                       pcs-handle = <&serdes11>;
-                       phy-mode = "1000base-x";
-                       managed = "in-band-status";
-                       sfp = <&sfp3>;
-               };
+               SWITCH_PORT_SFP(48, 49, 8, 0, 0)
+               SWITCH_PORT_SFP(50, 50, 9, 0, 1)
+               SWITCH_PORT_SFP(52, 51, 10, 0, 2)
+               SWITCH_PORT_SFP(53, 52, 11, 0, 3)
 
                port@56 {
                        ethernet = <&ethernet0>;

diff --git a/target/linux/realtek/dts/rtl9312_plasmacloud_common.dtsi b/target/linux/realtek/dts/rtl9312_plasmacloud_common.dtsi
index 19222c8bfb064ec427d4f8999a2c1e743324800a..b823d685bff46f3825b2fd6abb8082910c97a9c4 100644 (file)
--- a/target/linux/realtek/dts/rtl9312_plasmacloud_common.dtsi
+++ b/target/linux/realtek/dts/rtl9312_plasmacloud_common.dtsi
@@ -299,57 +299,10 @@
                SWITCH_PORT_SDS(44, 23, 7, 10g-qxgmii)
                SWITCH_PORT_SDS(45, 24, 7, 10g-qxgmii)
 
-               port@48 {
-                       reg = <48>;
-                       label = "lan25";
-                       pcs-handle = <&serdes8>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp0>;
-                       led-set = <1>;
-                       managed = "in-band-status";
-
-                       nvmem-cells = <&macaddr_ubootenv_ethaddr 25>;
-                       nvmem-cell-names = "mac-address";
-               };
-
-               port@50 {
-                       reg = <50>;
-                       label = "lan26";
-                       pcs-handle = <&serdes9>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp1>;
-                       led-set = <1>;
-                       managed = "in-band-status";
-
-                       nvmem-cells = <&macaddr_ubootenv_ethaddr 26>;
-                       nvmem-cell-names = "mac-address";
-               };
-
-               port@52 {
-                       reg = <52>;
-                       label = "lan27";
-                       pcs-handle = <&serdes10>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp2>;
-                       led-set = <1>;
-                       managed = "in-band-status";
-
-                       nvmem-cells = <&macaddr_ubootenv_ethaddr 27>;
-                       nvmem-cell-names = "mac-address";
-               };
-
-               port@53 {
-                       reg = <53>;
-                       label = "lan28";
-                       pcs-handle = <&serdes11>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp3>;
-                       led-set = <1>;
-                       managed = "in-band-status";
-
-                       nvmem-cells = <&macaddr_ubootenv_ethaddr 28>;
-                       nvmem-cell-names = "mac-address";
-               };
+               SWITCH_PORT_SFP(48, 25, 8, 1, 0)
+               SWITCH_PORT_SFP(50, 26, 9, 1, 1)
+               SWITCH_PORT_SFP(52, 27, 10, 1, 2)
+               SWITCH_PORT_SFP(53, 28, 11, 1, 3)
 
                /* cpu */
                port@56 {
@@ -483,3 +436,23 @@
        nvmem-cells = <&macaddr_ubootenv_ethaddr 24>;
        nvmem-cell-names = "mac-address";
 };
+
+&port48 {
+       nvmem-cells = <&macaddr_ubootenv_ethaddr 25>;
+       nvmem-cell-names = "mac-address";
+};
+
+&port50 {
+       nvmem-cells = <&macaddr_ubootenv_ethaddr 26>;
+       nvmem-cell-names = "mac-address";
+};
+
+&port52 {
+       nvmem-cells = <&macaddr_ubootenv_ethaddr 27>;
+       nvmem-cell-names = "mac-address";
+};
+
+&port53 {
+       nvmem-cells = <&macaddr_ubootenv_ethaddr 28>;
+       nvmem-cell-names = "mac-address";
+};

diff --git a/target/linux/realtek/dts/rtl9313_xikestor_sks8300-12x-v1.dts b/target/linux/realtek/dts/rtl9313_xikestor_sks8300-12x-v1.dts
index d3b46c73d8cd3b645ae6845a814c54a8dffcd77a..c61851357c3a318cedea0a9d76ff2e18c24e87fa 100644 (file)
--- a/target/linux/realtek/dts/rtl9313_xikestor_sks8300-12x-v1.dts
+++ b/target/linux/realtek/dts/rtl9313_xikestor_sks8300-12x-v1.dts
@@ -355,125 +355,18 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               port0: port@0 {
-                       reg = <0>;
-                       label = "lan1";
-                       led-set = <0>;
-                       managed = "in-band-status";
-                       pcs-handle = <&serdes2>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp1>;
-               };
-
-               port8: port@8 {
-                       reg = <8>;
-                       label = "lan2";
-                       led-set = <0>;
-                       managed = "in-band-status";
-                       pcs-handle = <&serdes3>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp2>;
-               };
-
-               port16: port@16 {
-                       reg = <16>;
-                       label = "lan3";
-                       led-set = <0>;
-                       managed = "in-band-status";
-                       pcs-handle = <&serdes4>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp3>;
-               };
-
-               port24: port@24 {
-                       reg = <24>;
-                       label = "lan4";
-                       led-set = <0>;
-                       managed = "in-band-status";
-                       pcs-handle = <&serdes5>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp4>;
-               };
-
-               port32: port@32 {
-                       reg = <32>;
-                       label = "lan5";
-                       led-set = <0>;
-                       managed = "in-band-status";
-                       pcs-handle = <&serdes6>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp5>;
-               };
-
-               port40: port@40 {
-                       reg = <40>;
-                       label = "lan6";
-                       led-set = <0>;
-                       managed = "in-band-status";
-                       pcs-handle = <&serdes7>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp6>;
-               };
-
-               port48: port@48 {
-                       reg = <48>;
-                       label = "lan7";
-                       led-set = <0>;
-                       managed = "in-band-status";
-                       pcs-handle = <&serdes8>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp7>;
-               };
-
-               port50: port@50 {
-                       reg = <50>;
-                       label = "lan8";
-                       led-set = <0>;
-                       managed = "in-band-status";
-                       pcs-handle = <&serdes9>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp8>;
-               };
-
-               port52: port@52 {
-                       reg = <52>;
-                       label = "lan10";
-                       led-set = <0>;
-                       managed = "in-band-status";
-                       pcs-handle = <&serdes10>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp10>;
-               };
-
-               port53: port@53 {
-                       reg = <53>;
-                       label = "lan9";
-                       led-set = <0>;
-                       managed = "in-band-status";
-                       pcs-handle = <&serdes11>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp9>;
-               };
-
-               port54: port@54 {
-                       reg = <54>;
-                       label = "lan12";
-                       led-set = <0>;
-                       managed = "in-band-status";
-                       pcs-handle = <&serdes12>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp12>;
-               };
-
-               port55: port@55 {
-                       reg = <55>;
-                       label = "lan11";
-                       led-set = <0>;
-                       managed = "in-band-status";
-                       pcs-handle = <&serdes13>;
-                       phy-mode = "1000base-x";
-                       sfp = <&sfp11>;
-               };
+               SWITCH_PORT_SFP(0, 1, 2, 0, 1)
+               SWITCH_PORT_SFP(8, 2, 3, 0, 2)
+               SWITCH_PORT_SFP(16, 3, 4, 0, 3)
+               SWITCH_PORT_SFP(24, 4, 5, 0, 4)
+               SWITCH_PORT_SFP(32, 5, 6, 0, 5)
+               SWITCH_PORT_SFP(40, 6, 7, 0, 6)
+               SWITCH_PORT_SFP(48, 7, 8, 0, 7)
+               SWITCH_PORT_SFP(50, 8, 9, 0, 8)
+               SWITCH_PORT_SFP(52, 10, 10, 0, 10)
+               SWITCH_PORT_SFP(53, 9, 11, 0, 9)
+               SWITCH_PORT_SFP(54, 12, 12, 0, 12)
+               SWITCH_PORT_SFP(55, 11, 13, 0, 11)
 
                /* CPU port */
                port@56 {