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: cb1b656027
("kernel: bump 6.12 to 6.12.34")
Signed-off-by: Mantas Pucka <mantas@8devices.com>
Link: https://github.com/openwrt/openwrt/pull/19232
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
parent
3fb1605931
commit
2c6a830c3d
4 changed files with 5 additions and 60 deletions
|
@ -39,7 +39,7 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/dts-v1/;
|
/dts-v1/;
|
||||||
@@ -164,6 +164,21 @@
|
@@ -171,6 +171,21 @@
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
||||||
|
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
|
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
|
||||||
+++ b/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>;
|
clock-mult = <1>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||||
*
|
*
|
||||||
--- a/include/linux/phy.h
|
--- a/include/linux/phy.h
|
||||||
+++ b/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
|
#define PHY_PAIR_ALL -1
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -92,7 +92,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||||
* struct phy_plca_cfg - Configuration of the PLCA (Physical Layer Collision
|
* struct phy_plca_cfg - Configuration of the PLCA (Physical Layer Collision
|
||||||
* Avoidance) Reconciliation Sublayer.
|
* Avoidance) Reconciliation Sublayer.
|
||||||
*
|
*
|
||||||
@@ -958,6 +976,14 @@ struct phy_driver {
|
@@ -955,6 +973,14 @@ struct phy_driver {
|
||||||
int (*get_features)(struct phy_device *phydev);
|
int (*get_features)(struct phy_device *phydev);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -107,7 +107,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||||
* @get_rate_matching: Get the supported type of rate matching for a
|
* @get_rate_matching: Get the supported type of rate matching for a
|
||||||
* particular phy interface. This is used by phy consumers to determine
|
* particular phy interface. This is used by phy consumers to determine
|
||||||
* whether to advertise lower-speed modes for that interface. It is
|
* 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_start_aneg(struct phy_device *phydev);
|
int phy_start_aneg(struct phy_device *phydev);
|
||||||
int phy_aneg_done(struct phy_device *phydev);
|
int phy_aneg_done(struct phy_device *phydev);
|
||||||
|
|
|
@ -1,55 +0,0 @@
|
||||||
From 3857f7cf650fa4ae0047b9b6fea6f7cd242de29c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Varadarajan Narayanan <quic_varada@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@quicinc.com>
|
|
||||||
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
|
|
||||||
Link: https://lore.kernel.org/r/20250207073545.1768990-2-quic_varada@quicinc.com
|
|
||||||
Signed-off-by: Bjorn Andersson <andersson@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";
|
|
Loading…
Reference in a new issue