| Message ID | 20230530-msm8939-regulators-v1-5-a3c3ac833567@gerhold.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9187d555c4ba9544c7f117062d241aa085f59a06 |
| Headers | show |
| Series | arm64: dts: qcom: msm8939: Rework regulator constraints | expand |
On 14/06/2023 08:16, Stephan Gerhold wrote: > The regulator constraints for the MSM8939 devices were originally taken > from Qualcomm's msm-3.10 vendor device tree (for lack of better > documentation). Unfortunately it turns out that Qualcomm's voltages are > slightly off as well and do not match the voltage constraints applied > by the RPM firmware. > > This means that we sometimes request a specific voltage but the RPM > firmware actually applies a much lower or higher voltage. This is > particularly critical for pm8916_l11 which is used as SD card VMMC > regulator: The SD card can choose a voltage from the current range of > 1.8 - 2.95V. If it chooses to run at 1.8V we pretend that this is fine > but the RPM firmware will still silently end up configuring 2.95V. > This can be easily reproduced with a multimeter or by checking the > SPMI hardware registers of the regulator. > > Apply the same change as for MSM8916 in commit 355750828c55 ("arm64: > dts: qcom: msm8916: Fix regulator constraints") and make the voltages > match the actual "specified range" in the PM8916 Device Specification > which is enforced by the RPM firmware. > > Signed-off-by: Stephan Gerhold <stephan@gerhold.net> Hrmm. I recently found in the schematic the following table. Supply | Default V | Range V | Rated I | Default On L1 1.2875 0.375-1.525 250 N L2 1.2 0.375.1.525 600 Y L3 1.15 0.375-1.525 350 Y L4 2.05 1.75-3.337 250 N L5 1.8 1.75-3.337 200 Y L6 1.8 1.75-3.337 150 Y L7 1.8 1.75-3.337 110 Y L8 2.9 1.75-3.337 400 Y L9 3.3 1.75-3.337 600 N L10 2.8 1.75-3.337 150 N L11 2.95 1.75-3.337 600 Y L12 2.95 1.75-3.337 50 Y L13 3.075 1.75-3.337 50 Y L14 1.8 1.75-3.337 55 N L15 1.8 1.75-3.337 55 N L16 1.8 1.75-3.337 55 N L17 2.85 1.75-3.337 450 N L18 2.7 1.75-3.337 150 N So let me see. L8 2.9 = true L11 2.95 = true S3 just says 1v3 but, I take your word for it on the multi-meter measurement. S4 says 2v1 This patch looks fine Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
diff --git a/arch/arm64/boot/dts/qcom/apq8039-t2.dts b/arch/arm64/boot/dts/qcom/apq8039-t2.dts index c8442242137a..ceae83b1480b 100644 --- a/arch/arm64/boot/dts/qcom/apq8039-t2.dts +++ b/arch/arm64/boot/dts/qcom/apq8039-t2.dts @@ -164,13 +164,13 @@ &smd_rpm_regulators { vdd_l7-supply = <&pm8916_s4>; pm8916_s3: s3 { - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1300000>; + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <1350000>; }; pm8916_s4: s4 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <2100000>; + regulator-min-microvolt = <1850000>; + regulator-max-microvolt = <2150000>; }; /* l1 is fixed to 1225000, but not connected in schematic */ @@ -201,7 +201,7 @@ pm8916_l7: l7 { }; pm8916_l8: l8 { - regulator-min-microvolt = <2850000>; + regulator-min-microvolt = <2900000>; regulator-max-microvolt = <2900000>; }; @@ -216,7 +216,7 @@ pm8916_l10: l10 { }; pm8916_l11: l11 { - regulator-min-microvolt = <1800000>; + regulator-min-microvolt = <2950000>; regulator-max-microvolt = <2950000>; }; diff --git a/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts index 509abcdad287..2905dd8d4bf9 100644 --- a/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts +++ b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts @@ -64,13 +64,13 @@ &smd_rpm_regulators { vdd_l7-supply = <&pm8916_s4>; pm8916_s3: s3 { - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1300000>; + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <1350000>; }; pm8916_s4: s4 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <2100000>; + regulator-min-microvolt = <1850000>; + regulator-max-microvolt = <2150000>; }; pm8916_l2: l2 { @@ -99,7 +99,7 @@ pm8916_l7: l7 { }; pm8916_l8: l8 { - regulator-min-microvolt = <2850000>; + regulator-min-microvolt = <2900000>; regulator-max-microvolt = <2900000>; }; @@ -114,7 +114,7 @@ pm8916_l10: l10 { }; pm8916_l11: l11 { - regulator-min-microvolt = <1800000>; + regulator-min-microvolt = <2950000>; regulator-max-microvolt = <2950000>; regulator-system-load = <200000>; regulator-allow-set-load;
The regulator constraints for the MSM8939 devices were originally taken from Qualcomm's msm-3.10 vendor device tree (for lack of better documentation). Unfortunately it turns out that Qualcomm's voltages are slightly off as well and do not match the voltage constraints applied by the RPM firmware. This means that we sometimes request a specific voltage but the RPM firmware actually applies a much lower or higher voltage. This is particularly critical for pm8916_l11 which is used as SD card VMMC regulator: The SD card can choose a voltage from the current range of 1.8 - 2.95V. If it chooses to run at 1.8V we pretend that this is fine but the RPM firmware will still silently end up configuring 2.95V. This can be easily reproduced with a multimeter or by checking the SPMI hardware registers of the regulator. Apply the same change as for MSM8916 in commit 355750828c55 ("arm64: dts: qcom: msm8916: Fix regulator constraints") and make the voltages match the actual "specified range" in the PM8916 Device Specification which is enforced by the RPM firmware. Signed-off-by: Stephan Gerhold <stephan@gerhold.net> --- arch/arm64/boot/dts/qcom/apq8039-t2.dts | 12 ++++++------ .../arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-)