From: Alexandru Gagniuc Date: Wed, 14 Jan 2026 22:28:02 +0000 (-0600) Subject: qualcommbe: drop "port_" from PPE port clock and reset names X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=05db696f30d64c0fc62d3da618b4023d79807a89;p=thirdparty%2Fopenwrt.git qualcommbe: drop "port_" from PPE port clock and reset names 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 Link: https://github.com/openwrt/openwrt/pull/21506 Signed-off-by: Robert Marko --- diff --git a/target/linux/qualcommbe/dts/ipq9570-kiwi-dvk.dts b/target/linux/qualcommbe/dts/ipq9570-kiwi-dvk.dts index 903772f7cc9..c00c2a2f7b5 100644 --- 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 b108366b1a8..05b18e820d5 100644 --- 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 + +/* 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 b7a703529cc..83f0e241170 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 @@ -83,15 +83,15 @@ Signed-off-by: Lei Wei + 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 + 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 + 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 + 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 + 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 + 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"; + }; + }; +};