[openwrt/openwrt] qualcommbe: drop "uniphy" from pcs node labels
LEDE Commits
lede-commits at lists.infradead.org
Sun Nov 30 07:51:18 PST 2025
robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/cc6b9ff17b95b05ed8758d749633bc750eba1243
commit cc6b9ff17b95b05ed8758d749633bc750eba1243
Author: Alexandru Gagniuc <mr.nuke.me at gmail.com>
AuthorDate: Thu Nov 6 20:59:37 2025 -0600
qualcommbe: drop "uniphy" from pcs node labels
According to Qualcomm developers, the pcs nodes on IPQ9574 will be
labeled "pcs<n>" and "pcs<n>_ch<m>". The proposed IPQ5424 changes
include the simpler labels. Rename the IPQ95xx nodes for consistency.
Signed-off-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>
Link: https://github.com/openwrt/openwrt/pull/20993
Signed-off-by: Robert Marko <robimarko at gmail.com>
---
.../arch/arm64/boot/dts/qcom/ipq9570-kiwi-dvk.dts | 6 ++---
...m64-dts-qcom-ipq9574-add-PCS-uniphy-nodes.patch | 30 +++++++++++-----------
...dts-qcom-Add-IPQ9574-PPE-base-device-node.patch | 2 +-
...-arm64-dts-qcom-Add-EDMA-node-for-IPQ9574.patch | 2 +-
...m64-dts-qcom-Add-IPQ9574-RDP433-port-node.patch | 12 ++++-----
...com-Add-label-to-EDMA-port-for-IPQ9574-RD.patch | 12 ++++-----
...qcom-ipq9574-add-NSSNOC-clock-to-nss-node.patch | 6 ++---
7 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/target/linux/qualcommbe/files/arch/arm64/boot/dts/qcom/ipq9570-kiwi-dvk.dts b/target/linux/qualcommbe/files/arch/arm64/boot/dts/qcom/ipq9570-kiwi-dvk.dts
index 19cc7e9807..903772f7cc 100644
--- a/target/linux/qualcommbe/files/arch/arm64/boot/dts/qcom/ipq9570-kiwi-dvk.dts
+++ b/target/linux/qualcommbe/files/arch/arm64/boot/dts/qcom/ipq9570-kiwi-dvk.dts
@@ -83,7 +83,7 @@
managed = "in-band-status";
label = "wan";
sfp = <&sfp0>;
- pcs-handle = <&pcsuniphy0_ch0>;
+ pcs-handle = <&pcs0_ch0>;
local-mac-address = [00 00 00 00 00 00];
clocks = <&nsscc NSS_CC_PORT1_MAC_CLK>,
<&nsscc NSS_CC_PORT1_RX_CLK>,
@@ -104,7 +104,7 @@
phy-mode = "2500base-x";
label = "lan1";
phy-handle = <&phy0>;
- pcs-handle = <&pcsuniphy1_ch0>;
+ pcs-handle = <&pcs1_ch0>;
local-mac-address = [00 00 00 00 00 00];
clocks = <&nsscc NSS_CC_PORT5_MAC_CLK>,
<&nsscc NSS_CC_PORT5_RX_CLK>,
@@ -126,7 +126,7 @@
managed = "in-band-status";
label = "lan2";
phy-handle = <&phy1>;
- pcs-handle = <&pcsuniphy2_ch0>;
+ pcs-handle = <&pcs2_ch0>;
local-mac-address = [00 00 00 00 00 00];
clocks = <&nsscc NSS_CC_PORT6_MAC_CLK>,
<&nsscc NSS_CC_PORT6_RX_CLK>,
diff --git a/target/linux/qualcommbe/patches-6.12/0322-arm64-dts-qcom-ipq9574-add-PCS-uniphy-nodes.patch b/target/linux/qualcommbe/patches-6.12/0322-arm64-dts-qcom-ipq9574-add-PCS-uniphy-nodes.patch
index 3d2219813c..29c20a240a 100644
--- a/target/linux/qualcommbe/patches-6.12/0322-arm64-dts-qcom-ipq9574-add-PCS-uniphy-nodes.patch
+++ b/target/linux/qualcommbe/patches-6.12/0322-arm64-dts-qcom-ipq9574-add-PCS-uniphy-nodes.patch
@@ -34,12 +34,12 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>
- <0>,
- <0>,
- <0>,
-+ <&pcs_uniphy0 0>,
-+ <&pcs_uniphy0 1>,
-+ <&pcs_uniphy1 0>,
-+ <&pcs_uniphy1 1>,
-+ <&pcs_uniphy2 0>,
-+ <&pcs_uniphy2 1>,
++ <&pcs0 0>,
++ <&pcs0 1>,
++ <&pcs1 0>,
++ <&pcs1 1>,
++ <&pcs2 0>,
++ <&pcs2 1>,
<&gcc GCC_NSSCC_CLK>;
clock-names = "xo",
"nss_1200",
@@ -48,7 +48,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>
#interconnect-cells = <1>;
};
+
-+ pcs_uniphy0: ethernet-pcs at 7a00000 {
++ pcs0: ethernet-pcs at 7a00000 {
+ compatible = "qcom,ipq9574-pcs";
+ reg = <0x7a00000 0x10000>;
+ #address-cells = <1>;
@@ -66,7 +66,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>
+
+ #clock-cells = <1>;
+
-+ pcsuniphy0_ch0: pcs-mii at 0 {
++ pcs0_ch0: pcs-mii at 0 {
+ reg = <0>;
+ clocks = <&nsscc NSS_CC_UNIPHY_PORT1_RX_CLK>,
+ <&nsscc NSS_CC_UNIPHY_PORT1_TX_CLK>;
@@ -74,7 +74,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>
+ "tx";
+ };
+
-+ pcsuniphy0_ch1: pcs-mii at 1 {
++ pcs0_ch1: pcs-mii at 1 {
+ reg = <1>;
+ clocks = <&nsscc NSS_CC_UNIPHY_PORT2_RX_CLK>,
+ <&nsscc NSS_CC_UNIPHY_PORT2_TX_CLK>;
@@ -82,7 +82,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>
+ "tx";
+ };
+
-+ pcsuniphy0_ch2: pcs-mii at 2 {
++ pcs0_ch2: pcs-mii at 2 {
+ reg = <2>;
+ clocks = <&nsscc NSS_CC_UNIPHY_PORT3_RX_CLK>,
+ <&nsscc NSS_CC_UNIPHY_PORT3_TX_CLK>;
@@ -90,7 +90,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>
+ "tx";
+ };
+
-+ pcsuniphy0_ch3: pcs-mii at 3 {
++ pcs0_ch3: pcs-mii at 3 {
+ reg = <3>;
+ clocks = <&nsscc NSS_CC_UNIPHY_PORT4_RX_CLK>,
+ <&nsscc NSS_CC_UNIPHY_PORT4_TX_CLK>;
@@ -99,7 +99,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>
+ };
+ };
+
-+ pcs_uniphy1: ethernet-pcs at 7a10000 {
++ pcs1: ethernet-pcs at 7a10000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "qcom,ipq9574-pcs";
@@ -116,7 +116,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>
+ "xpcs";
+ #clock-cells = <1>;
+
-+ pcsuniphy1_ch0: pcs-mii at 0 {
++ pcs1_ch0: pcs-mii at 0 {
+ reg = <0>;
+ clocks = <&nsscc NSS_CC_UNIPHY_PORT5_RX_CLK>,
+ <&nsscc NSS_CC_UNIPHY_PORT5_TX_CLK>;
@@ -125,7 +125,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>
+ };
+ };
+
-+ pcs_uniphy2: ethernet-pcs at 7a20000 {
++ pcs2: ethernet-pcs at 7a20000 {
+ compatible = "qcom,ipq9574-pcs";
+ reg = <0x7a20000 0x10000>;
+ #address-cells = <1>;
@@ -142,7 +142,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>
+ "xpcs";
+ #clock-cells = <1>;
+
-+ pcsuniphy2_ch0: pcs-mii at 0 {
++ pcs2_ch0: pcs-mii at 0 {
+ reg = <0>;
+ clocks = <&nsscc NSS_CC_UNIPHY_PORT6_RX_CLK>,
+ <&nsscc NSS_CC_UNIPHY_PORT6_TX_CLK>;
diff --git a/target/linux/qualcommbe/patches-6.12/0353-arm64-dts-qcom-Add-IPQ9574-PPE-base-device-node.patch b/target/linux/qualcommbe/patches-6.12/0353-arm64-dts-qcom-Add-IPQ9574-PPE-base-device-node.patch
index 2f50bbddd0..640a2a9f02 100644
--- a/target/linux/qualcommbe/patches-6.12/0353-arm64-dts-qcom-Add-IPQ9574-PPE-base-device-node.patch
+++ b/target/linux/qualcommbe/patches-6.12/0353-arm64-dts-qcom-Add-IPQ9574-PPE-base-device-node.patch
@@ -67,6 +67,6 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>
+ "memnoc_nssnoc_1";
+ };
+
- pcs_uniphy0: ethernet-pcs at 7a00000 {
+ pcs0: ethernet-pcs at 7a00000 {
compatible = "qcom,ipq9574-pcs";
reg = <0x7a00000 0x10000>;
diff --git a/target/linux/qualcommbe/patches-6.12/0354-arm64-dts-qcom-Add-EDMA-node-for-IPQ9574.patch b/target/linux/qualcommbe/patches-6.12/0354-arm64-dts-qcom-Add-EDMA-node-for-IPQ9574.patch
index 5a61f92026..f93ed0c37e 100644
--- a/target/linux/qualcommbe/patches-6.12/0354-arm64-dts-qcom-Add-EDMA-node-for-IPQ9574.patch
+++ b/target/linux/qualcommbe/patches-6.12/0354-arm64-dts-qcom-Add-EDMA-node-for-IPQ9574.patch
@@ -88,4 +88,4 @@ Signed-off-by: Pavithra R <quic_pavir at quicinc.com>
+ };
};
- pcs_uniphy0: ethernet-pcs at 7a00000 {
+ pcs0: ethernet-pcs at 7a00000 {
diff --git a/target/linux/qualcommbe/patches-6.12/0355-arm64-dts-qcom-Add-IPQ9574-RDP433-port-node.patch b/target/linux/qualcommbe/patches-6.12/0355-arm64-dts-qcom-Add-IPQ9574-RDP433-port-node.patch
index 708c0c8a63..b7a703529c 100644
--- a/target/linux/qualcommbe/patches-6.12/0355-arm64-dts-qcom-Add-IPQ9574-RDP433-port-node.patch
+++ b/target/linux/qualcommbe/patches-6.12/0355-arm64-dts-qcom-Add-IPQ9574-RDP433-port-node.patch
@@ -79,7 +79,7 @@ Signed-off-by: Lei Wei <quic_leiwei at quicinc.com>
+ phy-mode = "qsgmii";
+ managed = "in-band-status";
+ phy-handle = <&phy0>;
-+ pcs-handle = <&pcsuniphy0_ch0>;
++ pcs-handle = <&pcs0_ch0>;
+ clocks = <&nsscc NSS_CC_PORT1_MAC_CLK>,
+ <&nsscc NSS_CC_PORT1_RX_CLK>,
+ <&nsscc NSS_CC_PORT1_TX_CLK>;
@@ -99,7 +99,7 @@ Signed-off-by: Lei Wei <quic_leiwei at quicinc.com>
+ phy-mode = "qsgmii";
+ managed = "in-band-status";
+ phy-handle = <&phy1>;
-+ pcs-handle = <&pcsuniphy0_ch1>;
++ pcs-handle = <&pcs0_ch1>;
+ clocks = <&nsscc NSS_CC_PORT2_MAC_CLK>,
+ <&nsscc NSS_CC_PORT2_RX_CLK>,
+ <&nsscc NSS_CC_PORT2_TX_CLK>;
@@ -119,7 +119,7 @@ Signed-off-by: Lei Wei <quic_leiwei at quicinc.com>
+ phy-mode = "qsgmii";
+ managed = "in-band-status";
+ phy-handle = <&phy2>;
-+ pcs-handle = <&pcsuniphy0_ch2>;
++ pcs-handle = <&pcs0_ch2>;
+ clocks = <&nsscc NSS_CC_PORT3_MAC_CLK>,
+ <&nsscc NSS_CC_PORT3_RX_CLK>,
+ <&nsscc NSS_CC_PORT3_TX_CLK>;
@@ -139,7 +139,7 @@ Signed-off-by: Lei Wei <quic_leiwei at quicinc.com>
+ phy-mode = "qsgmii";
+ managed = "in-band-status";
+ phy-handle = <&phy3>;
-+ pcs-handle = <&pcsuniphy0_ch3>;
++ pcs-handle = <&pcs0_ch3>;
+ clocks = <&nsscc NSS_CC_PORT4_MAC_CLK>,
+ <&nsscc NSS_CC_PORT4_RX_CLK>,
+ <&nsscc NSS_CC_PORT4_TX_CLK>;
@@ -159,7 +159,7 @@ Signed-off-by: Lei Wei <quic_leiwei at quicinc.com>
+ phy-mode = "usxgmii";
+ managed = "in-band-status";
+ phy-handle = <&phy4>;
-+ pcs-handle = <&pcsuniphy1_ch0>;
++ pcs-handle = <&pcs1_ch0>;
+ clocks = <&nsscc NSS_CC_PORT5_MAC_CLK>,
+ <&nsscc NSS_CC_PORT5_RX_CLK>,
+ <&nsscc NSS_CC_PORT5_TX_CLK>;
@@ -179,7 +179,7 @@ Signed-off-by: Lei Wei <quic_leiwei at quicinc.com>
+ phy-mode = "usxgmii";
+ managed = "in-band-status";
+ phy-handle = <&phy5>;
-+ pcs-handle = <&pcsuniphy2_ch0>;
++ pcs-handle = <&pcs2_ch0>;
+ clocks = <&nsscc NSS_CC_PORT6_MAC_CLK>,
+ <&nsscc NSS_CC_PORT6_RX_CLK>,
+ <&nsscc NSS_CC_PORT6_TX_CLK>;
diff --git a/target/linux/qualcommbe/patches-6.12/0357-arm64-dts-qcom-Add-label-to-EDMA-port-for-IPQ9574-RD.patch b/target/linux/qualcommbe/patches-6.12/0357-arm64-dts-qcom-Add-label-to-EDMA-port-for-IPQ9574-RD.patch
index bac7f16635..950c9faf3c 100644
--- a/target/linux/qualcommbe/patches-6.12/0357-arm64-dts-qcom-Add-label-to-EDMA-port-for-IPQ9574-RD.patch
+++ b/target/linux/qualcommbe/patches-6.12/0357-arm64-dts-qcom-Add-label-to-EDMA-port-for-IPQ9574-RD.patch
@@ -18,7 +18,7 @@ Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
managed = "in-band-status";
+ label = "lan1";
phy-handle = <&phy0>;
- pcs-handle = <&pcsuniphy0_ch0>;
+ pcs-handle = <&pcs0_ch0>;
clocks = <&nsscc NSS_CC_PORT1_MAC_CLK>,
@@ -237,6 +238,7 @@
reg = <2>;
@@ -26,7 +26,7 @@ Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
managed = "in-band-status";
+ label = "lan2";
phy-handle = <&phy1>;
- pcs-handle = <&pcsuniphy0_ch1>;
+ pcs-handle = <&pcs0_ch1>;
clocks = <&nsscc NSS_CC_PORT2_MAC_CLK>,
@@ -257,6 +259,7 @@
reg = <3>;
@@ -34,7 +34,7 @@ Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
managed = "in-band-status";
+ label = "lan3";
phy-handle = <&phy2>;
- pcs-handle = <&pcsuniphy0_ch2>;
+ pcs-handle = <&pcs0_ch2>;
clocks = <&nsscc NSS_CC_PORT3_MAC_CLK>,
@@ -277,6 +280,7 @@
reg = <4>;
@@ -42,7 +42,7 @@ Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
managed = "in-band-status";
+ label = "lan4";
phy-handle = <&phy3>;
- pcs-handle = <&pcsuniphy0_ch3>;
+ pcs-handle = <&pcs0_ch3>;
clocks = <&nsscc NSS_CC_PORT4_MAC_CLK>,
@@ -297,6 +301,7 @@
reg = <5>;
@@ -50,7 +50,7 @@ Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
managed = "in-band-status";
+ label = "lan5";
phy-handle = <&phy4>;
- pcs-handle = <&pcsuniphy1_ch0>;
+ pcs-handle = <&pcs1_ch0>;
clocks = <&nsscc NSS_CC_PORT5_MAC_CLK>,
@@ -317,6 +322,7 @@
reg = <6>;
@@ -58,5 +58,5 @@ Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
managed = "in-band-status";
+ label = "wan";
phy-handle = <&phy5>;
- pcs-handle = <&pcsuniphy2_ch0>;
+ pcs-handle = <&pcs2_ch0>;
clocks = <&nsscc NSS_CC_PORT6_MAC_CLK>,
diff --git a/target/linux/qualcommbe/patches-6.12/0359-arm64-dts-qcom-ipq9574-add-NSSNOC-clock-to-nss-node.patch b/target/linux/qualcommbe/patches-6.12/0359-arm64-dts-qcom-ipq9574-add-NSSNOC-clock-to-nss-node.patch
index c847550d9d..c32f077a01 100644
--- a/target/linux/qualcommbe/patches-6.12/0359-arm64-dts-qcom-ipq9574-add-NSSNOC-clock-to-nss-node.patch
+++ b/target/linux/qualcommbe/patches-6.12/0359-arm64-dts-qcom-ipq9574-add-NSSNOC-clock-to-nss-node.patch
@@ -17,9 +17,9 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
@@ -1255,7 +1255,10 @@
- <&pcs_uniphy1 1>,
- <&pcs_uniphy2 0>,
- <&pcs_uniphy2 1>,
+ <&pcs1 1>,
+ <&pcs2 0>,
+ <&pcs2 1>,
- <&gcc GCC_NSSCC_CLK>;
+ <&gcc GCC_NSSCC_CLK>,
+ <&gcc GCC_NSSNOC_NSSCC_CLK>,
More information about the lede-commits
mailing list