[openwrt/openwrt] qualcommbe: v6.12: drop upstreamed patch
LEDE Commits
lede-commits at lists.infradead.org
Wed Jun 25 01:18:34 PDT 2025
robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/2c6a830c3dcd283ed19d5abeacfe09fe4f7987ac
commit 2c6a830c3dcd283ed19d5abeacfe09fe4f7987ac
Author: Mantas Pucka <mantas at 8devices.com>
AuthorDate: Wed Jun 25 10:49:47 2025 +0300
qualcommbe: v6.12: drop upstreamed patch
0102-arm64-dts-qcom-ipq9574-Fix-USB-vdd-info.patch was merged in 6.12.34
Other patches automatically refreshed.
Fixes: cb1b65602712 ("kernel: bump 6.12 to 6.12.34")
Signed-off-by: Mantas Pucka <mantas at 8devices.com>
Link: https://github.com/openwrt/openwrt/pull/19232
Signed-off-by: Robert Marko <robimarko at gmail.com>
---
...4-arm64-dts-qcom-ipq9574-Add-CMN-PLL-node.patch | 2 +-
...-dts-qcom-ipq9574-Update-xo_board_clk-to-.patch | 2 +-
.../0010-v6.14-net-phy-add-phy_inband_caps.patch | 6 +--
...2-arm64-dts-qcom-ipq9574-Fix-USB-vdd-info.patch | 55 ----------------------
4 files changed, 5 insertions(+), 60 deletions(-)
diff --git a/target/linux/qualcommbe/patches-6.12/0008-v6.14-arm64-dts-qcom-ipq9574-Add-CMN-PLL-node.patch b/target/linux/qualcommbe/patches-6.12/0008-v6.14-arm64-dts-qcom-ipq9574-Add-CMN-PLL-node.patch
index deaa7ca891..b29bbda235 100644
--- a/target/linux/qualcommbe/patches-6.12/0008-v6.14-arm64-dts-qcom-ipq9574-Add-CMN-PLL-node.patch
+++ b/target/linux/qualcommbe/patches-6.12/0008-v6.14-arm64-dts-qcom-ipq9574-Add-CMN-PLL-node.patch
@@ -39,7 +39,7 @@ Signed-off-by: Bjorn Andersson <andersson at kernel.org>
*/
/dts-v1/;
-@@ -164,6 +164,21 @@
+@@ -171,6 +171,21 @@
status = "okay";
};
diff --git a/target/linux/qualcommbe/patches-6.12/0009-v6.14-arm64-dts-qcom-ipq9574-Update-xo_board_clk-to-.patch b/target/linux/qualcommbe/patches-6.12/0009-v6.14-arm64-dts-qcom-ipq9574-Update-xo_board_clk-to-.patch
index e27d7791a7..0268c5c28e 100644
--- a/target/linux/qualcommbe/patches-6.12/0009-v6.14-arm64-dts-qcom-ipq9574-Update-xo_board_clk-to-.patch
+++ b/target/linux/qualcommbe/patches-6.12/0009-v6.14-arm64-dts-qcom-ipq9574-Update-xo_board_clk-to-.patch
@@ -19,7 +19,7 @@ Signed-off-by: Bjorn Andersson <andersson at kernel.org>
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
-@@ -175,8 +175,13 @@
+@@ -182,8 +182,13 @@
clock-mult = <1>;
};
diff --git a/target/linux/qualcommbe/patches-6.12/0010-v6.14-net-phy-add-phy_inband_caps.patch b/target/linux/qualcommbe/patches-6.12/0010-v6.14-net-phy-add-phy_inband_caps.patch
index 0cd3680176..112ea21d90 100644
--- a/target/linux/qualcommbe/patches-6.12/0010-v6.14-net-phy-add-phy_inband_caps.patch
+++ b/target/linux/qualcommbe/patches-6.12/0010-v6.14-net-phy-add-phy_inband_caps.patch
@@ -67,7 +67,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
*
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -819,6 +819,24 @@ struct phy_tdr_config {
+@@ -816,6 +816,24 @@ struct phy_tdr_config {
#define PHY_PAIR_ALL -1
/**
@@ -92,7 +92,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
* struct phy_plca_cfg - Configuration of the PLCA (Physical Layer Collision
* Avoidance) Reconciliation Sublayer.
*
-@@ -958,6 +976,14 @@ struct phy_driver {
+@@ -955,6 +973,14 @@ struct phy_driver {
int (*get_features)(struct phy_device *phydev);
/**
@@ -107,7 +107,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
* @get_rate_matching: Get the supported type of rate matching for a
* particular phy interface. This is used by phy consumers to determine
* whether to advertise lower-speed modes for that interface. It is
-@@ -1842,6 +1868,8 @@ int phy_config_aneg(struct phy_device *p
+@@ -1839,6 +1865,8 @@ int phy_config_aneg(struct phy_device *p
int _phy_start_aneg(struct phy_device *phydev);
int phy_start_aneg(struct phy_device *phydev);
int phy_aneg_done(struct phy_device *phydev);
diff --git a/target/linux/qualcommbe/patches-6.12/0102-arm64-dts-qcom-ipq9574-Fix-USB-vdd-info.patch b/target/linux/qualcommbe/patches-6.12/0102-arm64-dts-qcom-ipq9574-Fix-USB-vdd-info.patch
deleted file mode 100644
index dbf75c26d6..0000000000
--- a/target/linux/qualcommbe/patches-6.12/0102-arm64-dts-qcom-ipq9574-Fix-USB-vdd-info.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 3857f7cf650fa4ae0047b9b6fea6f7cd242de29c Mon Sep 17 00:00:00 2001
-From: Varadarajan Narayanan <quic_varada at quicinc.com>
-Date: Fri, 7 Feb 2025 13:05:45 +0530
-Subject: [PATCH] arm64: dts: qcom: ipq9574: Fix USB vdd info
-
-USB phys in ipq9574 use the 'L5' regulator. The commit ec4f047679d5
-("arm64: dts: qcom: ipq9574: Enable USB") incorrectly specified it as
-'L2'. Because of this when the phy module turns off/on its regulators,
-the wrong regulator is turned off/on resulting in 2 issues, namely the
-correct regulator related to the USB phy is not turned off/on and the
-module powered by the incorrect regulator is affected.
-
-Fixes: ec4f047679d5 ("arm64: dts: qcom: ipq9574: Enable USB")
-Signed-off-by: Varadarajan Narayanan <quic_varada at quicinc.com>
-Reviewed-by: Konrad Dybcio <konrad.dybcio at oss.qualcomm.com>
-Link: https://lore.kernel.org/r/20250207073545.1768990-2-quic_varada@quicinc.com
-Signed-off-by: Bjorn Andersson <andersson at kernel.org>
----
- arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
---- a/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
-+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
-@@ -111,6 +111,13 @@
- regulator-always-on;
- regulator-boot-on;
- };
-+
-+ mp5496_l5: l5 {
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <1800000>;
-+ regulator-always-on;
-+ regulator-boot-on;
-+ };
- };
- };
-
-@@ -146,7 +153,7 @@
- };
-
- &usb_0_qmpphy {
-- vdda-pll-supply = <&mp5496_l2>;
-+ vdda-pll-supply = <&mp5496_l5>;
- vdda-phy-supply = <®ulator_fixed_0p925>;
-
- status = "okay";
-@@ -154,7 +161,7 @@
-
- &usb_0_qusbphy {
- vdd-supply = <®ulator_fixed_0p925>;
-- vdda-pll-supply = <&mp5496_l2>;
-+ vdda-pll-supply = <&mp5496_l5>;
- vdda-phy-dpdm-supply = <®ulator_fixed_3p3>;
-
- status = "okay";
More information about the lede-commits
mailing list