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>
This commit is contained in:
Jonas Jelonek 2026-04-15 20:30:58 +00:00 committed by Hauke Mehrtens
parent d12e654a34
commit 858dfdd832
13 changed files with 99 additions and 633 deletions

View File

@ -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>;

View File

@ -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";
};

View File

@ -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";
};
port@27 {
reg = <27>;
label = "lan10";
pcs-handle = <&serdes9>;
phy-mode = "1000base-x";
sfp = <&sfp1>;
led-set = <0>;
managed = "in-band-status";
nvmem-cells = <&macaddr_ubootenv_ethaddr 10>;
nvmem-cell-names = "mac-address";
};
SWITCH_PORT_SFP(26, 9, 8, 0, 0)
SWITCH_PORT_SFP(27, 10, 9, 0, 1)
};
};
&port26 {
nvmem-cells = <&macaddr_ubootenv_ethaddr 9>;
nvmem-cell-names = "mac-address";
};
&port27 {
nvmem-cells = <&macaddr_ubootenv_ethaddr 10>;
nvmem-cell-names = "mac-address";
};

View File

@ -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>;

View File

@ -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>;

View File

@ -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>;

View File

@ -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>;

View File

@ -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>;

View File

@ -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>;

View File

@ -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>;

View File

@ -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>;

View File

@ -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";
};

View File

@ -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 {