From: George Moussalem Date: Thu, 8 Jan 2026 09:32:42 +0000 (+0400) Subject: qualcommax: ipq50xx: match QDSK ports unit address with port id X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;p=openwrt%2Fopenwrt.git qualcommax: ipq50xx: match QDSK ports unit address with port id Match the unit address of both QSDK switch ports with the node's port_id property. Purely cleanup, no functional change. Signed-off-by: George Moussalem Link: https://github.com/openwrt/openwrt/pull/21456 Signed-off-by: Robert Marko --- diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax6000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax6000.dts index 4782101483..67b00f2f89 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax6000.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax6000.dts @@ -298,7 +298,7 @@ qcom,port_phyinfo { // MAC0 -> GE Phy --- MDI --- QCA8337 Switch - port@0 { + port@1 { port_id = <1>; mdiobus = <&mdio0>; phy_address = <7>; @@ -306,7 +306,7 @@ }; // MAC1 -> Uniphy --- SGMII --- QCA8081 - port@1 { + port@2 { port_id = <2>; mdiobus = <&mdio1>; phy_address = <8>; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax830.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax830.dts index 90d930909e..310548a7ba 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax830.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax830.dts @@ -82,14 +82,14 @@ qcom,port_phyinfo { // MAC0 -> GE Phy - port@0 { + port@1 { port_id = <1>; mdiobus = <&mdio0>; phy_address = <7>; }; // MAC1 -> Uniphy --- SGMII --- QCA8081 - port@1 { + port@2 { port_id = <2>; mdiobus = <&mdio1>; phy_address = <28>; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax850.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax850.dts index 592fc84c5b..30b5bc2747 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax850.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax850.dts @@ -81,14 +81,14 @@ qcom,port_phyinfo { // MAC0 -> GE Phy - port@0 { + port@1 { port_id = <1>; mdiobus = <&mdio0>; phy_address = <7>; }; // MAC1 -> Uniphy --- SGMII --- QCA8081 - port@1 { + port@2 { port_id = <2>; mdiobus = <&mdio1>; phy_address = <28>; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-gl-b3000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-gl-b3000.dts index 4094867a11..d0cd077491 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-gl-b3000.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-gl-b3000.dts @@ -64,14 +64,14 @@ qcom,port_phyinfo { // MAC0 -> GE Phy -> QCA8337 Phy2 - port@0 { + port@1 { port_id = <1>; mdiobus = <&mdio0>; phy_address = <7>; }; // MAC1 ---SGMII---> QCA8337 SerDes - port@1 { + port@2 { port_id = <2>; forced-speed = <1000>; forced-duplex = <1>; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts index 4c1f50938c..f9ee89d62e 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts @@ -55,14 +55,14 @@ qcom,port_phyinfo { // MAC0 -> GE Phy - port@0 { + port@1 { port_id = <1>; mdiobus = <&mdio0>; phy_address = <7>; }; // MAC1 ---SGMII---> QCA8337 SerDes - port@1 { + port@2 { port_id = <2>; forced-speed = <1000>; forced-duplex = <1>; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts index 428912332c..9d5fae468f 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts @@ -36,14 +36,14 @@ qcom,port_phyinfo { // MAC0 -> GE Phy -> QCA8337 Phy4 - port@0 { + port@1 { port_id = <1>; mdiobus = <&mdio0>; phy_address = <7>; }; // MAC1 ---SGMII---> QCA8337 SerDes - port@1 { + port@2 { port_id = <2>; forced-speed = <1000>; forced-duplex = <1>; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts index 73d232e05c..fd7fa70d52 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts @@ -35,14 +35,14 @@ qcom,port_phyinfo { // MAC0 -> GE Phy -> QCA8337 Phy4 - port@0 { + port@1 { port_id = <1>; mdiobus = <&mdio0>; phy_address = <7>; }; // MAC1 ---SGMII---> QCA8337 SerDes - port@1 { + port@2 { port_id = <2>; forced-speed = <1000>; forced-duplex = <1>; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx6200.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx6200.dts index 250fe39075..8bd1281520 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx6200.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx6200.dts @@ -39,14 +39,14 @@ qcom,port_phyinfo { // MAC0 -> GE Phy -> MDI --> RJ45 - port@0 { + port@1 { port_id = <1>; mdiobus = <&mdio0>; phy_address = <7>; }; // MAC1 ---SGMII---> MaxLinear PHY -> RJ45 - port@1 { + port@2 { port_id = <2>; mdiobus = <&mdio1>; phy_address = <15>; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-pz-l8.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-pz-l8.dts index a90c6ca8b0..f09007503f 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-pz-l8.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-pz-l8.dts @@ -143,14 +143,14 @@ qcom,port_phyinfo { // MAC0 -> GE Phy --- MDI --- QCA8337 Phy4(Port5) - port@0 { + port@1 { port_id = <1>; mdiobus = <&mdio0>; phy_address = <7>; }; // MAC1 -> Uniphy --- SGMII --- QCA8337 SerDes(Port6) - port@1 { + port@2 { port_id = <2>; mdiobus = <&mdio1>; forced-speed = <1000>; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-scr50axe.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-scr50axe.dts index fd625af414..29faf99de0 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-scr50axe.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-scr50axe.dts @@ -140,13 +140,13 @@ qcom,port_phyinfo { - port@0 { + port@1 { port_id = <1>; mdiobus = <&mdio0>; phy_address = <7>; }; - port@1 { + port@2 { port_id = <2>; forced-speed = <1000>; forced-duplex = <1>; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts index 1dafa63414..2cc71e4a2e 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts @@ -38,7 +38,7 @@ qcom,port_phyinfo { // MAC0 -> GE Phy --- MDI --- QCA8337 Switch - port@0 { + port@1 { port_id = <1>; mdiobus = <&mdio0>; phy_address = <7>; @@ -46,7 +46,7 @@ }; // MAC1 -> Uniphy --- SGMII --- QCA8081 - port@1 { + port@2 { port_id = <2>; mdiobus = <&mdio1>; phy_address = <28>; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-wn-dax3000gr.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-wn-dax3000gr.dts index de6d415314..770cd95876 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-wn-dax3000gr.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-wn-dax3000gr.dts @@ -200,13 +200,13 @@ switch_mac_mode = ; qcom,port_phyinfo { - port@0 { + port@1 { port_id = <1>; mdiobus = <&mdio0>; phy_address = <7>; }; - port@1 { + port@2 { port_id = <2>; forced-speed = <1000>; forced-duplex = <1>; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-wrc-x3000gs2.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-wrc-x3000gs2.dts index 1b6018dbef..03a3bbe7d7 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-wrc-x3000gs2.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-wrc-x3000gs2.dts @@ -194,13 +194,13 @@ switch_mac_mode = ; qcom,port_phyinfo { - port@0 { + port@1 { port_id = <1>; mdiobus = <&mdio0>; phy_address = <7>; }; - port@1 { + port@2 { port_id = <2>; forced-speed = <1000>; forced-duplex = <1>;