]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
projects / thirdparty / openwrt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 30394cc)
qualcommbe: drop "port_" from PPE port clock and reset names
authorAlexandru Gagniuc <mr.nuke.me@gmail.com>
Wed, 14 Jan 2026 22:28:02 +0000 (16:28 -0600)
committerRobert Marko <robimarko@gmail.com>
Thu, 28 May 2026 08:15:20 +0000 (10:15 +0200)
The lastest ethernet PPE driver, uses "mac", "rx", and "tx", without
the "port_" prefix for the port clocks and resets. The PPE ports are
declared by the device dts. In order to support v6.12 and v6.18
kernels simultaneously, update the kernel patches and kiwi-dvk
devicetree to use the newer naming scheme.

Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/21506
Signed-off-by: Robert Marko <robimarko@gmail.com>
target/linux/qualcommbe/dts/ipq9570-kiwi-dvk.dts patch | blob | blame | history
target/linux/qualcommbe/patches-6.12/0338-net-ethernet-qualcomm-Add-phylink-support-for-PPE-MA.patch patch | blob | blame | history
target/linux/qualcommbe/patches-6.12/0355-arm64-dts-qcom-Add-IPQ9574-RDP433-port-node.patch patch | blob | blame | history

diff --git a/target/linux/qualcommbe/dts/ipq9570-kiwi-dvk.dts b/target/linux/qualcommbe/dts/ipq9570-kiwi-dvk.dts
index 903772f7cc93cda25bf1c34f296945e294bf0070..c00c2a2f7b506ae0657a3bbd0ed1574422a1f456 100644 (file)
--- a/target/linux/qualcommbe/dts/ipq9570-kiwi-dvk.dts
+++ b/target/linux/qualcommbe/dts/ipq9570-kiwi-dvk.dts
@@ -88,15 +88,15 @@
                        clocks = <&nsscc NSS_CC_PORT1_MAC_CLK>,
                                 <&nsscc NSS_CC_PORT1_RX_CLK>,
                                 <&nsscc NSS_CC_PORT1_TX_CLK>;
-                       clock-names = "port_mac",
-                                     "port_rx",
-                                     "port_tx";
+                       clock-names = "mac",
+                                     "rx",
+                                     "tx";
                        resets = <&nsscc PORT1_MAC_ARES>,
                                 <&nsscc PORT1_RX_ARES>,
                                 <&nsscc PORT1_TX_ARES>;
-                       reset-names = "port_mac",
-                                     "port_rx",
-                                     "port_tx";
+                       reset-names = "mac",
+                                     "rx",
+                                     "tx";
                };
 
                xgmac5: port@5 {
@@ -109,15 +109,15 @@
                        clocks = <&nsscc NSS_CC_PORT5_MAC_CLK>,
                                 <&nsscc NSS_CC_PORT5_RX_CLK>,
                                 <&nsscc NSS_CC_PORT5_TX_CLK>;
-                       clock-names = "port_mac",
-                                     "port_rx",
-                                     "port_tx";
+                       clock-names = "mac",
+                                     "rx",
+                                     "tx";
                        resets = <&nsscc PORT5_MAC_ARES>,
                                 <&nsscc PORT5_RX_ARES>,
                                 <&nsscc PORT5_TX_ARES>;
-                       reset-names = "port_mac",
-                                     "port_rx",
-                                     "port_tx";
+                       reset-names = "mac",
+                                     "rx",
+                                     "tx";
                };
 
                xgmac6: port@6 {
@@ -131,15 +131,15 @@
                        clocks = <&nsscc NSS_CC_PORT6_MAC_CLK>,
                                 <&nsscc NSS_CC_PORT6_RX_CLK>,
                                 <&nsscc NSS_CC_PORT6_TX_CLK>;
-                       clock-names = "port_mac",
-                                     "port_rx",
-                                     "port_tx";
+                       clock-names = "mac",
+                                     "rx",
+                                     "tx";
                        resets = <&nsscc PORT6_MAC_ARES>,
                                 <&nsscc PORT6_RX_ARES>,
                                 <&nsscc PORT6_TX_ARES>;
-                       reset-names = "port_mac",
-                                     "port_rx",
-                                     "port_tx";
+                       reset-names = "mac",
+                                     "rx",
+                                     "tx";
                };
        };
 };
diff --git a/target/linux/qualcommbe/patches-6.12/0338-net-ethernet-qualcomm-Add-phylink-support-for-PPE-MA.patch b/target/linux/qualcommbe/patches-6.12/0338-net-ethernet-qualcomm-Add-phylink-support-for-PPE-MA.patch
index b108366b1a8c748a6aaa5299c7fc5dafef16b954..05b18e820d50406851b5b02f0bf2496e094ce571 100644 (file)
--- a/target/linux/qualcommbe/patches-6.12/0338-net-ethernet-qualcomm-Add-phylink-support-for-PPE-MA.patch
+++ b/target/linux/qualcommbe/patches-6.12/0338-net-ethernet-qualcomm-Add-phylink-support-for-PPE-MA.patch
@@ -120,9 +120,9 @@ Signed-off-by: Lei Wei <quic_leiwei@quicinc.com>
 +
 +/* PPE port clock and reset name */
 +static const char * const ppe_port_clk_rst_name[] = {
-+      [PPE_PORT_CLK_RST_MAC] = "port_mac",
-+      [PPE_PORT_CLK_RST_RX] = "port_rx",
-+      [PPE_PORT_CLK_RST_TX] = "port_tx",
++      [PPE_PORT_CLK_RST_MAC] = "mac",
++      [PPE_PORT_CLK_RST_RX] = "rx",
++      [PPE_PORT_CLK_RST_TX] = "tx",
 +};
 +
 +/* PPE port and MAC reset */
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 b7a703529cc9b741b6f1ff1c71a14ad11a698e92..83f0e2411707fcd94c2040358e1a8ba886ad7ed3 100644 (file)
--- 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
@@ -83,15 +83,15 @@ Signed-off-by: Lei Wei <quic_leiwei@quicinc.com>
 +                      clocks = <&nsscc NSS_CC_PORT1_MAC_CLK>,
 +                               <&nsscc NSS_CC_PORT1_RX_CLK>,
 +                               <&nsscc NSS_CC_PORT1_TX_CLK>;
-+                      clock-names = "port_mac",
-+                                    "port_rx",
-+                                    "port_tx";
++                      clock-names = "mac",
++                                    "rx",
++                                    "tx";
 +                      resets = <&nsscc PORT1_MAC_ARES>,
 +                               <&nsscc PORT1_RX_ARES>,
 +                               <&nsscc PORT1_TX_ARES>;
-+                      reset-names = "port_mac",
-+                                    "port_rx",
-+                                    "port_tx";
++                      reset-names = "mac",
++                                    "rx",
++                                    "tx";
 +              };
 +
 +              port@2 {
@@ -103,15 +103,15 @@ Signed-off-by: Lei Wei <quic_leiwei@quicinc.com>
 +                      clocks = <&nsscc NSS_CC_PORT2_MAC_CLK>,
 +                               <&nsscc NSS_CC_PORT2_RX_CLK>,
 +                               <&nsscc NSS_CC_PORT2_TX_CLK>;
-+                      clock-names = "port_mac",
-+                                    "port_rx",
-+                                    "port_tx";
++                      clock-names = "mac",
++                                    "rx",
++                                    "tx";
 +                      resets = <&nsscc PORT2_MAC_ARES>,
 +                               <&nsscc PORT2_RX_ARES>,
 +                               <&nsscc PORT2_TX_ARES>;
-+                      reset-names = "port_mac",
-+                                    "port_rx",
-+                                    "port_tx";
++                      reset-names = "mac",
++                                    "rx",
++                                    "tx";
 +              };
 +
 +              port@3 {
@@ -123,15 +123,15 @@ Signed-off-by: Lei Wei <quic_leiwei@quicinc.com>
 +                      clocks = <&nsscc NSS_CC_PORT3_MAC_CLK>,
 +                               <&nsscc NSS_CC_PORT3_RX_CLK>,
 +                               <&nsscc NSS_CC_PORT3_TX_CLK>;
-+                      clock-names = "port_mac",
-+                                    "port_rx",
-+                                    "port_tx";
++                      clock-names = "mac",
++                                    "rx",
++                                    "tx";
 +                      resets = <&nsscc PORT3_MAC_ARES>,
 +                               <&nsscc PORT3_RX_ARES>,
 +                               <&nsscc PORT3_TX_ARES>;
-+                      reset-names = "port_mac",
-+                                    "port_rx",
-+                                    "port_tx";
++                      reset-names = "mac",
++                                    "rx",
++                                    "tx";
 +              };
 +
 +              port@4 {
@@ -143,15 +143,15 @@ Signed-off-by: Lei Wei <quic_leiwei@quicinc.com>
 +                      clocks = <&nsscc NSS_CC_PORT4_MAC_CLK>,
 +                               <&nsscc NSS_CC_PORT4_RX_CLK>,
 +                               <&nsscc NSS_CC_PORT4_TX_CLK>;
-+                      clock-names = "port_mac",
-+                                    "port_rx",
-+                                    "port_tx";
++                      clock-names = "mac",
++                                    "rx",
++                                    "tx";
 +                      resets = <&nsscc PORT4_MAC_ARES>,
 +                               <&nsscc PORT4_RX_ARES>,
 +                               <&nsscc PORT4_TX_ARES>;
-+                      reset-names = "port_mac",
-+                                    "port_rx",
-+                                    "port_tx";
++                      reset-names = "mac",
++                                    "rx",
++                                    "tx";
 +              };
 +
 +              port@5 {
@@ -163,15 +163,15 @@ Signed-off-by: Lei Wei <quic_leiwei@quicinc.com>
 +                      clocks = <&nsscc NSS_CC_PORT5_MAC_CLK>,
 +                               <&nsscc NSS_CC_PORT5_RX_CLK>,
 +                               <&nsscc NSS_CC_PORT5_TX_CLK>;
-+                      clock-names = "port_mac",
-+                                    "port_rx",
-+                                    "port_tx";
++                      clock-names = "mac",
++                                    "rx",
++                                    "tx";
 +                      resets = <&nsscc PORT5_MAC_ARES>,
 +                               <&nsscc PORT5_RX_ARES>,
 +                               <&nsscc PORT5_TX_ARES>;
-+                      reset-names = "port_mac",
-+                                    "port_rx",
-+                                    "port_tx";
++                      reset-names = "mac",
++                                    "rx",
++                                    "tx";
 +              };
 +
 +              port@6 {
@@ -183,15 +183,15 @@ Signed-off-by: Lei Wei <quic_leiwei@quicinc.com>
 +                      clocks = <&nsscc NSS_CC_PORT6_MAC_CLK>,
 +                               <&nsscc NSS_CC_PORT6_RX_CLK>,
 +                               <&nsscc NSS_CC_PORT6_TX_CLK>;
-+                      clock-names = "port_mac",
-+                                    "port_rx",
-+                                    "port_tx";
++                      clock-names = "mac",
++                                    "rx",
++                                    "tx";
 +                      resets = <&nsscc PORT6_MAC_ARES>,
 +                               <&nsscc PORT6_RX_ARES>,
 +                               <&nsscc PORT6_TX_ARES>;
-+                      reset-names = "port_mac",
-+                                    "port_rx",
-+                                    "port_tx";
++                      reset-names = "mac",
++                                    "rx",
++                                    "tx";
 +              };
 +      };
 +};
Mirror of https://github.com/openwrt/openwrt.git