Revert "qualcommax: ipq50xx: fix GE_PHY and Uniphy resets"

This reverts commit 34e5bc4af54d366147a83904c094d54fec7fb025.

While fixing support for 2.5Gbps mode on uniphy in phy to phy link
setups, it inadvertently broke fixed link scenario. So let's revert this
commit until there's a fix that doesn't impact fixed links.

Signed-off-by: George Moussalem <george.moussalem@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/18668
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/qualcommax/patches-6.6/0712-net-phy-qcom-Introduce-IPQ5018-internal-PHY-driver.patch b/target/linux/qualcommax/patches-6.6/0711-net-phy-qcom-Introduce-IPQ5018-internal-PHY-driver.patch
similarity index 100%
rename from target/linux/qualcommax/patches-6.6/0712-net-phy-qcom-Introduce-IPQ5018-internal-PHY-driver.patch
rename to target/linux/qualcommax/patches-6.6/0711-net-phy-qcom-Introduce-IPQ5018-internal-PHY-driver.patch

diff --git a/target/linux/qualcommax/patches-6.6/0711-arm64-dts-qcom-ipq5018-add-mdio-node.patch b/target/linux/qualcommax/patches-6.6/0712-arm64-dts-qcom-ipq5018-add-mdio-node.patch
similarity index 100%
rename from target/linux/qualcommax/patches-6.6/0711-arm64-dts-qcom-ipq5018-add-mdio-node.patch
rename to target/linux/qualcommax/patches-6.6/0712-arm64-dts-qcom-ipq5018-add-mdio-node.patch

diff --git a/target/linux/qualcommax/patches-6.6/0718-arm64-dts-qcom-ipq5018-add-ge_phy-node.patch b/target/linux/qualcommax/patches-6.6/0713-arm64-dts-qcom-ipq5018-add-ge_phy-node.patch
similarity index 85%
rename from target/linux/qualcommax/patches-6.6/0718-arm64-dts-qcom-ipq5018-add-ge_phy-node.patch
rename to target/linux/qualcommax/patches-6.6/0713-arm64-dts-qcom-ipq5018-add-ge_phy-node.patch
index 7c40277dc27bd3c4ddb757420b3e92ec111b5e5c..d72261306d9a49e207414a35ccdc27d41c8916f0 100644 (file)
--- a/target/linux/qualcommax/patches-6.6/0718-arm64-dts-qcom-ipq5018-add-ge_phy-node.patch
+++ b/target/linux/qualcommax/patches-6.6/0713-arm64-dts-qcom-ipq5018-add-ge_phy-node.patch
@@ -13,7 +13,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -202,6 +202,19 @@
+@@ -202,6 +202,21 @@
                        clock-names = "gcc_mdio_ahb_clk";
  
                        status = "disabled";
@@ -21,19 +21,21 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 +                      ge_phy: ethernet-phy@7 {
 +                              compatible = "ethernet-phy-id004d.d0c0";
 +                              reg = <7>;
-+
 +                              clocks = <&gcc GCC_GEPHY_RX_CLK>,
 +                                       <&gcc GCC_GEPHY_TX_CLK>;
 +
 +                              resets = <&gcc GCC_GEPHY_BCR>,
-+                                       <&gcc GCC_GEPHY_MISC_ARES>;
++                                       <&gcc GCC_GEPHY_MDC_SW_ARES>,
++                                       <&gcc GCC_GEPHY_DSP_HW_ARES>,
++                                       <&gcc GCC_GEPHY_RX_ARES>,
++                                       <&gcc GCC_GEPHY_TX_ARES>;
 +
 +                              #clock-cells = <1>;
 +                      };
                };
  
                mdio1: mdio@90000 {
-@@ -398,8 +411,8 @@
+@@ -398,8 +413,8 @@
                                 <&pcie0_phy>,
                                 <&pcie1_phy>,
                                 <0>,

diff --git a/target/linux/qualcommax/patches-6.6/0713-net-phy-qcom-ipq5018-enable-configuration-of-DAC-settings.patch b/target/linux/qualcommax/patches-6.6/0714-net-phy-qcom-IPQ5018-enable-configuration-of-DAC-settings.patch
similarity index 100%
rename from target/linux/qualcommax/patches-6.6/0713-net-phy-qcom-ipq5018-enable-configuration-of-DAC-settings.patch
rename to target/linux/qualcommax/patches-6.6/0714-net-phy-qcom-IPQ5018-enable-configuration-of-DAC-settings.patch

diff --git a/target/linux/qualcommax/patches-6.6/0714-net-phy-qcom-add-ipq5018-initvals-and-CDT-feature.patch b/target/linux/qualcommax/patches-6.6/0715-net-phy-qcom-add-IPQ5018-initvals-and-CDT-feature.patch
similarity index 100%
rename from target/linux/qualcommax/patches-6.6/0714-net-phy-qcom-add-ipq5018-initvals-and-CDT-feature.patch
rename to target/linux/qualcommax/patches-6.6/0715-net-phy-qcom-add-IPQ5018-initvals-and-CDT-feature.patch

diff --git a/target/linux/qualcommax/patches-6.6/0717-clk-qcom-gcc-ipq5018-fix-ge_phy-and-uniphy-resets.patch b/target/linux/qualcommax/patches-6.6/0717-clk-qcom-gcc-ipq5018-fix-ge_phy-and-uniphy-resets.patch
deleted file mode 100644 (file)
index 65a1fb0..0000000
--- a/target/linux/qualcommax/patches-6.6/0717-clk-qcom-gcc-ipq5018-fix-ge_phy-and-uniphy-resets.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: George Moussalem <george.moussalem@outlook.com>
-Date: Tue, 29 Apr 2025 17:16:31 +0400
-Subject: [PATCH] clk: qcom: gcc-ipq5018: fix GE_PHY and Uniphy resets
-
-The resets for the GE PHY and Uniphy use bitmasks to assert multiple
-resets simultaneously. These bitmasks are missing and the reset is only
-performed partially against BIT(x) where x is the bit set in the GCC.
-So let's remove the single bit and replace them by the bitmasks as
-intended.
-
-Link: https://git.codelinaro.org/clo/qsdk/oss/kernel/linux-ipq-5.4/-/commit/00743c3e82fa87cba4460e7a2ba32f473a9ce932
-Link: https://git.codelinaro.org/clo/qsdk/oss/kernel/linux-ipq-5.4/-/commit/036bdc62aca561e8ff94a29c447fc400de2b7304
-
-Signed-off-by: zhongjia <zhongjia@codeaurora.org>
-Signed-off-by: George Moussalem <george.moussalem@outlook.com>
----
---- a/drivers/clk/qcom/gcc-ipq5018.c
-+++ b/drivers/clk/qcom/gcc-ipq5018.c
-@@ -3566,7 +3566,7 @@ static const struct qcom_reset_map gcc_i
-       [GCC_DDRSS_BCR] = { 0x1e000, 0 },
-       [GCC_EDPD_BCR] = { 0x3a000, 0 },
-       [GCC_GEPHY_BCR] = { 0x56000, 0 },
--      [GCC_GEPHY_MDC_SW_ARES] = { 0x56004, 0 },
-+      [GCC_GEPHY_MDC_SW_ARES] = { 0x56004, .bitmask = 0x3 },
-       [GCC_GEPHY_DSP_HW_ARES] = { 0x56004, 1 },
-       [GCC_GEPHY_RX_ARES] = { 0x56004, 2 },
-       [GCC_GEPHY_TX_ARES] = { 0x56004, 3 },
-@@ -3646,7 +3646,7 @@ static const struct qcom_reset_map gcc_i
-       [GCC_UNIPHY_SYS_ARES] = { 0x56104, 1 },
-       [GCC_UNIPHY_RX_ARES] = { 0x56104, 4 },
-       [GCC_UNIPHY_TX_ARES] = { 0x56104, 5 },
--      [GCC_UNIPHY_SOFT_RESET] = {0x56104, 0 },
-+      [GCC_UNIPHY_SOFT_RESET] = {0x56104, .bitmask = 0x32 },
-       [GCC_USB0_BCR] = { 0x3e070, 0 },
-       [GCC_USB0_PHY_BCR] = { 0x3e034, 0 },
-       [GCC_WCSS_BCR] = { 0x18000, 0 },
-@@ -3659,7 +3659,7 @@ static const struct qcom_reset_map gcc_i
-       [GCC_WCSS_AXI_S_ARES] = { 0x59008, 6 },
-       [GCC_WCSS_Q6_BCR] = { 0x18004, 0 },
-       [GCC_WCSSAON_RESET] = { 0x59010, 0},
--      [GCC_GEPHY_MISC_ARES] = { 0x56004, 0 },
-+      [GCC_GEPHY_MISC_ARES] = { 0x56004, .bitmask = 0xf },
- };
- 
- static const struct of_device_id gcc_ipq5018_match_table[] = {

diff --git a/target/linux/qualcommax/patches-6.6/0715-clk-qcom-gcc-ipq5018-remove-the-unsupported-clk-combinati.patch b/target/linux/qualcommax/patches-6.6/0721-clk-gcc-ipq5018-remove-the-unsupported-clk-combinati.patch
similarity index 94%
rename from target/linux/qualcommax/patches-6.6/0715-clk-qcom-gcc-ipq5018-remove-the-unsupported-clk-combinati.patch
rename to target/linux/qualcommax/patches-6.6/0721-clk-gcc-ipq5018-remove-the-unsupported-clk-combinati.patch
index 37a70fe17fe2d44fd69ba0d5d53812161b89b0ce..0a22289d39ae2757bfa74e0835c2998237c3ae04 100644 (file)
--- a/target/linux/qualcommax/patches-6.6/0715-clk-qcom-gcc-ipq5018-remove-the-unsupported-clk-combinati.patch
+++ b/target/linux/qualcommax/patches-6.6/0721-clk-gcc-ipq5018-remove-the-unsupported-clk-combinati.patch
@@ -1,7 +1,7 @@
 From f71366e0530db2c5cecbbbb6edfbf7344bd6f83b Mon Sep 17 00:00:00 2001
 From: Ziyang Huang <hzyitc@outlook.com>
 Date: Sun, 8 Sep 2024 16:40:12 +0800
-Subject: [PATCH] clk: gcc-ipq5018: remove the unsupported clk
+Subject: [PATCH 1/2] clk: gcc-ipq5018: remove the unsupported clk
  combination for gmac
 
 Comment out the unsupported clock combination in the frequency table 

diff --git a/target/linux/qualcommax/patches-6.6/0716-clk-qcom-gcc-ipq5018-refer-to-ge-phy-rx-and-tx-clk-providers-by-name.patch b/target/linux/qualcommax/patches-6.6/0722-clk-gcc-ipq5018-refer-to-ge-phy-rx-and-tx-clk-providers-by-name.patch
similarity index 100%
rename from target/linux/qualcommax/patches-6.6/0716-clk-qcom-gcc-ipq5018-refer-to-ge-phy-rx-and-tx-clk-providers-by-name.patch
rename to target/linux/qualcommax/patches-6.6/0722-clk-gcc-ipq5018-refer-to-ge-phy-rx-and-tx-clk-providers-by-name.patch

diff --git a/target/linux/qualcommax/patches-6.6/0816-arm64-dts-qcom-ipq5018-add-wifi-support.patch b/target/linux/qualcommax/patches-6.6/0816-arm64-dts-qcom-ipq5018-add-wifi-support.patch
index d15868892838a99b607b779054a31df3a2581572..4c766d6e0d4047a55594d95d58a99a9d931eebca 100644 (file)
--- a/target/linux/qualcommax/patches-6.6/0816-arm64-dts-qcom-ipq5018-add-wifi-support.patch
+++ b/target/linux/qualcommax/patches-6.6/0816-arm64-dts-qcom-ipq5018-add-wifi-support.patch
@@ -13,7 +13,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 ---
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -697,6 +697,225 @@
+@@ -699,6 +699,225 @@
                        };
                };