From: Mantas Pucka Date: Wed, 25 Jun 2025 07:49:47 +0000 (+0300) Subject: qualcommbe: v6.12: drop upstreamed patch X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c6a830c3dcd283ed19d5abeacfe09fe4f7987ac;p=thirdparty%2Fopenwrt.git 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 Link: https://github.com/openwrt/openwrt/pull/19232 Signed-off-by: Robert Marko --- 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 deaa7ca891c..b29bbda2355 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 */ /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 e27d7791a73..0268c5c28e8 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 --- 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 0cd3680176a..112ea21d901 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 * --- 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 * 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 * @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 dbf75c26d60..00000000000 --- 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 -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 -Reviewed-by: Konrad Dybcio -Link: https://lore.kernel.org/r/20250207073545.1768990-2-quic_varada@quicinc.com -Signed-off-by: Bjorn Andersson ---- - 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";