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 <george.moussalem@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/21456
Signed-off-by: Robert Marko <robimarko@gmail.com>

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 4782101483b7ab9ba7360df7b450a368775fcfc8..67b00f2f8954f3d688b9d0d24af1267d061c038b 100644 (file)
--- 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 90d930909e32d311d4c004194e4215e2778f437a..310548a7ba1ade2b25c7882b81c6f8426c35c092 100644 (file)
--- 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 592fc84c5bccb2288b810e4c5df339ac555a49b6..30b5bc2747731391b07041812e8d8ac9ef5a1ca0 100644 (file)
--- 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 4094867a11b0d70d9736be319b757b34db5986f7..d0cd077491cfe631ced836d36c9b052e67cf85a7 100644 (file)
--- 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 4c1f50938cb80bc18b6ffc73a6fa343360f61872..f9ee89d62e783638d12ea67ba177358a898628f5 100644 (file)
--- 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 428912332ce9b165473d44ab3ceaf05a88e230f7..9d5fae468f6f8a9a468705b4af105bb1580c06c8 100644 (file)
--- 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 73d232e05c6d735038270d18ec1d060fdd99eda9..fd7fa70d52ab3e821697f5ace21067f75c408bd8 100644 (file)
--- 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 250fe39075451a566c75392bae78b1b036a6f9a9..8bd128152058e38ad6d53978e792b9bb66b94218 100644 (file)
--- 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 a90c6ca8b04b607c771afc7d5b17d49a8bb427f4..f09007503fef686cf495937bb10bc70d89b43365 100644 (file)
--- 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 fd625af4147541fad50f188a8d138d309e60f16e..29faf99de0c043d2200d4aee2b7e857aedf9ce05 100644 (file)
--- 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 1dafa63414cc24323647800472ed296afbe57a50..2cc71e4a2e92de94558920c5bd8f3bc237954a86 100644 (file)
--- 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 de6d4153143092d4f8e252f73142ece426637311..770cd95876e2bb40c1c3cbbe14d06d8bd33fc143 100644 (file)
--- 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 = <MAC_MODE_SGMII_CHANNEL0>;
 
        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 1b6018dbef8591f1270bf3f793252e17a0d1dee2..03a3bbe7d71d93a82e429511e5145a974ac4ba60 100644 (file)
--- 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 = <MAC_MODE_SGMII_CHANNEL0>;
 
        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>;