From b62912bf0114bb4d2c47ee5a81ba8d8f1e4e3dbd Mon Sep 17 00:00:00 2001 From: Jishnu Prakash Date: Thu, 14 Jul 2022 18:44:04 +0530 Subject: [PATCH] ARM: dts: msm: Update stub regulators for anorak Update anorak stub regulators based on updates in PGA document. In addition, update the LDOE regulators used by some clients to correct ones based on updated PGA, as LDOE regulators have been removed. Change-Id: Ie4fda972fc806a59194db090353b7817300c36f5 --- qcom/anorak-pcie.dtsi | 12 +- qcom/anorak-rumi.dtsi | 8 +- qcom/anorak-stub-regulator.dtsi | 280 ++++++++++++++------------------ 3 files changed, 128 insertions(+), 172 deletions(-) diff --git a/qcom/anorak-pcie.dtsi b/qcom/anorak-pcie.dtsi index 2caed44f..a9628c6f 100644 --- a/qcom/anorak-pcie.dtsi +++ b/qcom/anorak-pcie.dtsi @@ -47,8 +47,8 @@ &pcie0_wake_default>; gdsc-vdd-supply = <&gcc_pcie_0_gdsc>; - vreg-1p8-supply = <&L1E>; - vreg-0p9-supply = <&L2E>; + vreg-1p8-supply = <&L2C>; + vreg-0p9-supply = <&L2F>; vreg-qref-supply = <&L2D>; vreg-cx-supply = <&VDD_CX_LEVEL>; vreg-mx-supply = <&VDD_MXA_LEVEL>; @@ -312,8 +312,8 @@ &pcie1_wake_default>; gdsc-vdd-supply = <&gcc_pcie_1_gdsc>; - vreg-1p8-supply = <&L1E>; - vreg-0p9-supply = <&L2E>; + vreg-1p8-supply = <&L2C>; + vreg-0p9-supply = <&L2F>; vreg-qref-supply = <&L2D>; vreg-cx-supply = <&VDD_CX_LEVEL>; vreg-mx-supply = <&VDD_MXA_LEVEL>; @@ -573,8 +573,8 @@ &pcie2_clkreq_sleep>; gdsc-vdd-supply = <&gcc_pcie_2_gdsc>; - vreg-1p8-supply = <&L1E>; - vreg-0p9-supply = <&L2E>; + vreg-1p8-supply = <&L2C>; + vreg-0p9-supply = <&L2F>; vreg-qref-supply = <&L2D>; vreg-cx-supply = <&VDD_CX_LEVEL>; vreg-mx-supply = <&VDD_MXA_LEVEL>; diff --git a/qcom/anorak-rumi.dtsi b/qcom/anorak-rumi.dtsi index b918a53c..c389d93a 100644 --- a/qcom/anorak-rumi.dtsi +++ b/qcom/anorak-rumi.dtsi @@ -124,8 +124,8 @@ &ufsphy_mem { compatible = "qcom,ufs-phy-qrbtc-sdm845"; - vdda-phy-supply = <&L2E>; - vdda-pll-supply = <&L1E>; + vdda-phy-supply = <&L2F>; + vdda-pll-supply = <&L2C>; vdda-phy-max-microamp = <138000>; vdda-pll-max-microamp = <18300>; @@ -143,10 +143,10 @@ vcc-supply = <&L13B>; vcc-max-microamp = <1300000>; - vccq-supply = <&L3E>; + vccq-supply = <&L3B>; vccq-max-microamp = <1200000>; - qcom,vddp-ref-clk-supply = <&L3E>; + qcom,vddp-ref-clk-supply = <&L3B>; qcom,vddp-ref-clk-max-microamp = <100>; qcom,disable-lpm; diff --git a/qcom/anorak-stub-regulator.dtsi b/qcom/anorak-stub-regulator.dtsi index 2d839645..3c4f7345 100644 --- a/qcom/anorak-stub-regulator.dtsi +++ b/qcom/anorak-stub-regulator.dtsi @@ -5,31 +5,31 @@ L1B: pmxr2230_l1: regulator-pmxr2230-l1 { compatible = "qcom,stub-regulator"; regulator-name = "pmxr2230_l1"; - regulator-min-microvolt = <1700000>; - regulator-max-microvolt = <1800000>; + regulator-min-microvolt = <830000>; + regulator-max-microvolt = <920000>; qcom,hpm-min-load = <10000>; }; L2B: pmxr2230_l2: regulator-pmxr2230-l2 { compatible = "qcom,stub-regulator"; regulator-name = "pmxr2230_l2"; - regulator-min-microvolt = <2900000>; - regulator-max-microvolt = <3544000>; + regulator-min-microvolt = <1170000>; + regulator-max-microvolt = <1800000>; qcom,hpm-min-load = <10000>; }; L3B: pmxr2230_l3: regulator-pmxr2230-l3 { compatible = "qcom,stub-regulator"; regulator-name = "pmxr2230_l3"; - regulator-min-microvolt = <1710000>; - regulator-max-microvolt = <1800000>; + regulator-min-microvolt = <1080000>; + regulator-max-microvolt = <1320000>; qcom,hpm-min-load = <10000>; }; L4B: pmxr2230_l4: regulator-pmxr2230-l4 { compatible = "qcom,stub-regulator"; regulator-name = "pmxr2230_l4"; - regulator-min-microvolt = <1080000>; + regulator-min-microvolt = <1710000>; regulator-max-microvolt = <1800000>; qcom,hpm-min-load = <10000>; }; @@ -37,41 +37,40 @@ L5B: pmxr2230_l5: regulator-pmxr2230-l5 { compatible = "qcom,stub-regulator"; regulator-name = "pmxr2230_l5"; - regulator-min-microvolt = <2700000>; - regulator-max-microvolt = <3544000>; + regulator-min-microvolt = <1710000>; + regulator-max-microvolt = <1890000>; qcom,hpm-min-load = <10000>; }; - L6B: pmxr2230_l6: regulator-pmxr2230-l6 { compatible = "qcom,stub-regulator"; regulator-name = "pmxr2230_l6"; - regulator-min-microvolt = <1504000>; - regulator-max-microvolt = <3544000>; + regulator-min-microvolt = <1620000>; + regulator-max-microvolt = <1800000>; qcom,hpm-min-load = <10000>; }; L7B: pmxr2230_l7: regulator-pmxr2230-l7 { compatible = "qcom,stub-regulator"; regulator-name = "pmxr2230_l7"; - regulator-min-microvolt = <1504000>; - regulator-max-microvolt = <3544000>; + regulator-min-microvolt = <512000>; + regulator-max-microvolt = <1800000>; qcom,hpm-min-load = <10000>; }; L8B: pmxr2230_l8: regulator-pmxr2230-l8 { compatible = "qcom,stub-regulator"; regulator-name = "pmxr2230_l8"; - regulator-min-microvolt = <1760000>; - regulator-max-microvolt = <1840000>; + regulator-min-microvolt = <1700000>; + regulator-max-microvolt = <1800000>; qcom,hpm-min-load = <10000>; }; L9B: pmxr2230_l9: regulator-pmxr2230-l9 { compatible = "qcom,stub-regulator"; regulator-name = "pmxr2230_l9"; - regulator-min-microvolt = <2504000>; - regulator-max-microvolt = <3000000>; + regulator-min-microvolt = <1700000>; + regulator-max-microvolt = <1800000>; qcom,hpm-min-load = <10000>; }; @@ -94,8 +93,8 @@ L12B: pmxr2230_l12: regulator-pmxr2230-l12 { compatible = "qcom,stub-regulator"; regulator-name = "pmxr2230_l12"; - regulator-min-microvolt = <1080000>; - regulator-max-microvolt = <1320000>; + regulator-min-microvolt = <2504000>; + regulator-max-microvolt = <3000000>; qcom,hpm-min-load = <10000>; }; @@ -110,7 +109,7 @@ L14B: pmxr2230_l14: regulator-pmxr2230-l14 { compatible = "qcom,stub-regulator"; regulator-name = "pmxr2230_l14"; - regulator-min-microvolt = <2700000>; + regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3544000>; qcom,hpm-min-load = <10000>; }; @@ -118,8 +117,8 @@ L15B: pmxr2230_l15: regulator-pmxr2230-l15 { compatible = "qcom,stub-regulator"; regulator-name = "pmxr2230_l15"; - regulator-min-microvolt = <1010000>; - regulator-max-microvolt = <1800000>; + regulator-min-microvolt = <2700000>; + regulator-max-microvolt = <3544000>; qcom,hpm-min-load = <10000>; }; @@ -134,16 +133,16 @@ L17B: pmxr2230_l17: regulator-pmxr2230-l17 { compatible = "qcom,stub-regulator"; regulator-name = "pmxr2230_l17"; - regulator-min-microvolt = <2504000>; - regulator-max-microvolt = <3000000>; + regulator-min-microvolt = <1504000>; + regulator-max-microvolt = <3544000>; qcom,hpm-min-load = <10000>; }; L18B: pmxr2230_l18: regulator-pmxr2230-l18 { compatible = "qcom,stub-regulator"; regulator-name = "pmxr2230_l18"; - regulator-min-microvolt = <1504000>; - regulator-max-microvolt = <3544000>; + regulator-min-microvolt = <1760000>; + regulator-max-microvolt = <3100000>; qcom,hpm-min-load = <10000>; }; @@ -158,15 +157,15 @@ BOB: pmxr2230_bob: regulator-pmxr2230-bob { compatible = "qcom,stub-regulator"; regulator-name = "pmxr2230_bob"; - regulator-min-microvolt = <2500000>; + regulator-min-microvolt = <1504000>; regulator-max-microvolt = <3960000>; }; VDD_MM_LEVEL: - S5B_LEVEL: - pmxr2230_s5_level: regulator-pmxr2230-s5-level { + S4B_LEVEL: + pmxr2230_s4_level: regulator-pmxr2230-s4-level { compatible = "qcom,stub-regulator"; - regulator-name = "pmxr2230_s5_level"; + regulator-name = "pmxr2230_s4_level"; regulator-min-microvolt = ; regulator-max-microvolt = ; }; @@ -174,29 +173,29 @@ S1B: pmxr2230_s1: regulator-pmxr2230-s1 { compatible = "qcom,stub-regulator"; regulator-name = "pmxr2230_s1"; - regulator-min-microvolt = <690000>; - regulator-max-microvolt = <1980000>; + regulator-min-microvolt = <1816000>; + regulator-max-microvolt = <2040000>; }; S2B: pmxr2230_s2: regulator-pmxr2230-s2 { compatible = "qcom,stub-regulator"; regulator-name = "pmxr2230_s2"; - regulator-min-microvolt = <1250000>; - regulator-max-microvolt = <1980000>; + regulator-min-microvolt = <1224000>; + regulator-max-microvolt = <1518000>; }; S3B: pmxr2230_s3: regulator-pmxr2230-s3 { compatible = "qcom,stub-regulator"; regulator-name = "pmxr2230_s3"; - regulator-min-microvolt = <1700000>; - regulator-max-microvolt = <1980000>; + regulator-min-microvolt = <880000>; + regulator-max-microvolt = <1120000>; }; S6B: pmxr2230_s6: regulator-pmxr2230-s6 { compatible = "qcom,stub-regulator"; regulator-name = "pmxr2230_s6"; - regulator-min-microvolt = <806000>; - regulator-max-microvolt = <1003000>; + regulator-min-microvolt = <352000>; + regulator-max-microvolt = <888000>; }; VDD_LPI_CX_LEVEL: @@ -215,63 +214,26 @@ compatible = "qcom,stub-regulator"; regulator-name = "pm_v6c_l2"; qcom,hpm-min-load = <30000>; - regulator-min-microvolt = <870000>; - regulator-max-microvolt = <970000>; - }; - - VDD_LPI_MX_LEVEL: - L3C_LEVEL: - pm_v6c_l3_level: regulator-pm-v6c-l3-level { - compatible = "qcom,stub-regulator"; - regulator-name = "pm_v6c_l3_level"; - qcom,hpm-min-load = <30000>; - regulator-min-microvolt = ; - regulator-max-microvolt = ; - }; - - S1C: - pm_v6c_s1: regulator-pm-v6c-s1 { - compatible = "qcom,stub-regulator"; - regulator-name = "pm_v6c_s1"; - regulator-min-microvolt = <352000>; - regulator-max-microvolt = <1052000>; - qcom,hpm-min-load = <10000>; + regulator-min-microvolt = <1140000>; + regulator-max-microvolt = <1260000>; }; VDD_MXA_LEVEL: - S2C_LEVEL: - pm_v6c_s2_level: regulator-pm-v6c-s2-level { + S3C_LEVEL: + pm_v6c_s3_level: regulator-pm-v6c-s3-level { compatible = "qcom,stub-regulator"; - regulator-name = "pm_v6c_s2_level"; + regulator-name = "pm_v6c_s3_level"; regulator-min-microvolt = ; regulator-max-microvolt = ; qcom,hpm-min-load = <10000>; }; - S3C: - pm_v6c_s3: regulator-pm-v6c-s3 { - compatible = "qcom,stub-regulator"; - regulator-name = "pm_v6c_s3"; - regulator-min-microvolt = <1010000>; - regulator-max-microvolt = <1120000>; - qcom,hpm-min-load = <10000>; - }; - - S4C: - pm_v6c_s4: regulator-pm-v6c-s4 { - compatible = "qcom,stub-regulator"; - regulator-name = "pm_v6c_s4"; - regulator-min-microvolt = <352000>; - regulator-max-microvolt = <1052000>; - qcom,hpm-min-load = <10000>; - }; - L1D: pm_v6d_l1: regulator-pm-v6d-l1 { compatible = "qcom,stub-regulator"; regulator-name = "pm_v6d_l1"; - regulator-min-microvolt = <1170000>; - regulator-max-microvolt = <1800000>; + regulator-min-microvolt = <720000>; + regulator-max-microvolt = <950000>; qcom,hpm-min-load = <30000>; }; @@ -279,8 +241,8 @@ pm_v6d_l2: regulator-pm-v6d-l2 { compatible = "qcom,stub-regulator"; regulator-name = "pm_v6d_l2"; - regulator-min-microvolt = <720000>; - regulator-max-microvolt = <1050000>; + regulator-min-microvolt = <870000>; + regulator-max-microvolt = <970000>; qcom,hpm-min-load = <30000>; }; @@ -288,31 +250,31 @@ pm_v6d_l3: regulator-pm-v6d-l3 { compatible = "qcom,stub-regulator"; regulator-name = "pm_v6d_l3"; - regulator-min-microvolt = <1140000>; - regulator-max-microvolt = <1260000>; + regulator-min-microvolt = <320000>; + regulator-max-microvolt = <1800000>; qcom,hpm-min-load = <30000>; }; - S4D: - pm_v6d_s4: regulator-pm-v6d-s4 { - compatible = "qcom,stub-regulator"; - regulator-name = "pm_v6d_s4"; - regulator-min-microvolt = <300000>; - regulator-max-microvolt = <570000>; - qcom,hpm-min-load = <10000>; - }; - VDD_EBI_LEVEL: - S5D_LEVEL: - pm_v6d_s5_level: regulator-pm-v6d-s5-level { + S4D_LEVEL: + pm_v6d_s4_level: regulator-pm-v6d-s4-level { compatible = "qcom,stub-regulator"; - regulator-name = "pm_v6d_s5_level"; + regulator-name = "pm_v6d_s4_level"; qcom,hpm-min-load = <10000>; regulator-min-microvolt = ; regulator-max-microvolt = ; }; + S5D: + pm_v6d_s5: regulator-pm-v6d-s5 { + compatible = "qcom,stub-regulator"; + regulator-name = "pm_v6d_s5"; + regulator-min-microvolt = <300000>; + regulator-max-microvolt = <570000>; + qcom,hpm-min-load = <10000>; + }; + VDD_CX_LEVEL: S6D_LEVEL: pm_v6d_s6_level: regulator-pm-v6d-s6-level { @@ -324,51 +286,61 @@ regulator-max-microvolt = ; }; - L1E: - pm_v6e_l1: regulator-pm-v6e-l1 { + VDD_LPI_MX_LEVEL: + L1F_LEVEL: + pm_v8_l1_level: regulator-pm-v8-l1-level { compatible = "qcom,stub-regulator"; - regulator-name = "pm_v6e_l1"; - regulator-min-microvolt = <1140000>; - regulator-max-microvolt = <1260000>; + regulator-name = "pm_v8_l1_level"; + qcom,hpm-min-load = <30000>; + regulator-min-microvolt = ; + regulator-max-microvolt = ; + }; + + L2F: + pm_v8_l2: regulator-pm-v8-l2 { + compatible = "qcom,stub-regulator"; + regulator-name = "pm_v8_l2"; + regulator-min-microvolt = <788000>; + regulator-max-microvolt = <1050000>; qcom,hpm-min-load = <30000>; }; - L2E: - pm_v6e_l2: regulator-pm-v6e-l2 { + L3F: + pm_v8_l3: regulator-pm-v8-l3 { compatible = "qcom,stub-regulator"; - regulator-name = "pm_v6e_l2"; - regulator-min-microvolt = <830000>; - regulator-max-microvolt = <950000>; - qcom,hpm-min-load = <30000>; - }; - - L3E: - pm_v6e_l3: regulator-pm-v6e-l3 { - compatible = "qcom,stub-regulator"; - regulator-name = "pm_v6e_l3"; - regulator-min-microvolt = <320000>; + regulator-name = "pm_v8_l3"; + regulator-min-microvolt = <1700000>; regulator-max-microvolt = <1800000>; qcom,hpm-min-load = <30000>; }; VDD_MXC_LEVEL: - S1E_LEVEL: + S2F_LEVEL: VDD_MM_MXC_VOTER_LEVEL: VDD_GFX_MXC_VOTER_LEVEL: - pm_v6e_s1_level: regulator-pm-v6e-s1-level { + pm_v8_s2_level: regulator-pm-v8-s2-level { compatible = "qcom,stub-regulator"; - regulator-name = "pm_v6e_s1_level"; + regulator-name = "pm_v8_s2_level"; qcom,hpm-min-load = <30000>; regulator-min-microvolt = ; regulator-max-microvolt = ; }; - VDD_GFX_LEVEL: - S2E_LEVEL: - pm_v6e_s2_level: regulator-pm-v6e-s2-level { + S4F: + pm_v8_s4: regulator-pm-v8-s4 { compatible = "qcom,stub-regulator"; - regulator-name = "pm_v6e_s2_level"; + regulator-name = "pm_v8_s4"; + regulator-min-microvolt = <806000>; + regulator-max-microvolt = <2210000>; + qcom,hpm-min-load = <10000>; + }; + + VDD_GFX_LEVEL: + S5F_LEVEL: + pm_v8_s5_level: regulator-pm-v8-s5-level { + compatible = "qcom,stub-regulator"; + regulator-name = "pm_v8_s5_level"; qcom,hpm-min-load = <30000>; regulator-min-microvolt = ; @@ -378,8 +350,8 @@ L1I: pm8010i_l1: regulator-pm8010i-l1 { compatible = "qcom,stub-regulator"; regulator-name = "pm8010i_l1"; - regulator-min-microvolt = <528000>; - regulator-max-microvolt = <1544000>; + regulator-min-microvolt = <1140000>; + regulator-max-microvolt = <1260000>; qcom,hpm-min-load = <30000>; }; @@ -394,96 +366,80 @@ L3I: pm8010i_l3: regulator-pm8010i-l3 { compatible = "qcom,stub-regulator"; regulator-name = "pm8010i_l3"; - regulator-min-microvolt = <1792000>; - regulator-max-microvolt = <3312000>; + regulator-min-microvolt = <2600000>; + regulator-max-microvolt = <3000000>; qcom,hpm-min-load = <30000>; }; L4I: pm8010i_l4: regulator-pm8010i-l4 { compatible = "qcom,stub-regulator"; regulator-name = "pm8010i_l4"; - regulator-min-microvolt = <1792000>; - regulator-max-microvolt = <3312000>; + regulator-min-microvolt = <2600000>; + regulator-max-microvolt = <3000000>; qcom,hpm-min-load = <30000>; }; L5I: pm8010i_l5: regulator-pm8010i-l5 { compatible = "qcom,stub-regulator"; regulator-name = "pm8010i_l5"; - regulator-min-microvolt = <1504000>; - regulator-max-microvolt = <3544000>; + regulator-min-microvolt = <2600000>; + regulator-max-microvolt = <3000000>; qcom,hpm-min-load = <30000>; }; L6I: pm8010i_l6: regulator-pm8010i-l6 { compatible = "qcom,stub-regulator"; regulator-name = "pm8010i_l6"; - regulator-min-microvolt = <1792000>; - regulator-max-microvolt = <3312000>; - qcom,hpm-min-load = <30000>; - }; - - L7I: pm8010i_l7: regulator-pm8010i-l7 { - compatible = "qcom,stub-regulator"; - regulator-name = "pm8010i_l7"; - regulator-min-microvolt = <1504000>; - regulator-max-microvolt = <3544000>; + regulator-min-microvolt = <2600000>; + regulator-max-microvolt = <3000000>; qcom,hpm-min-load = <30000>; }; L1J: pm8010j_l1: regulator-pm8010j-l1 { compatible = "qcom,stub-regulator"; regulator-name = "pm8010j_l1"; - regulator-min-microvolt = <528000>; - regulator-max-microvolt = <1544000>; + regulator-min-microvolt = <1140000>; + regulator-max-microvolt = <1260000>; qcom,hpm-min-load = <30000>; }; L2J: pm8010j_l2: regulator-pm8010j-l2 { compatible = "qcom,stub-regulator"; regulator-name = "pm8010j_l2"; - regulator-min-microvolt = <528000>; - regulator-max-microvolt = <1544000>; + regulator-min-microvolt = <950000>; + regulator-max-microvolt = <1150000>; qcom,hpm-min-load = <30000>; }; L3J: pm8010j_l3: regulator-pm8010j-l3 { compatible = "qcom,stub-regulator"; regulator-name = "pm8010j_l3"; - regulator-min-microvolt = <1792000>; - regulator-max-microvolt = <3312000>; + regulator-min-microvolt = <2700000>; + regulator-max-microvolt = <3000000>; qcom,hpm-min-load = <30000>; }; L4J: pm8010j_l4: regulator-pm8010j-l4 { compatible = "qcom,stub-regulator"; regulator-name = "pm8010j_l4"; - regulator-min-microvolt = <1792000>; - regulator-max-microvolt = <3312000>; + regulator-min-microvolt = <2700000>; + regulator-max-microvolt = <3000000>; qcom,hpm-min-load = <30000>; }; L5J: pm8010j_l5: regulator-pm8010j-l5 { compatible = "qcom,stub-regulator"; regulator-name = "pm8010j_l5"; - regulator-min-microvolt = <1504000>; - regulator-max-microvolt = <3544000>; - qcom,hpm-min-load = <30000>; - }; - - L6J: pm8010j_l6: regulator-pm8010j-l6 { - compatible = "qcom,stub-regulator"; - regulator-name = "pm8010j_l6"; - regulator-min-microvolt = <1792000>; - regulator-max-microvolt = <3312000>; + regulator-min-microvolt = <2600000>; + regulator-max-microvolt = <3000000>; qcom,hpm-min-load = <30000>; }; L7J: pm8010j_l7: regulator-pm8010j-l7 { compatible = "qcom,stub-regulator"; regulator-name = "pm8010j_l7"; - regulator-min-microvolt = <1504000>; - regulator-max-microvolt = <3544000>; + regulator-min-microvolt = <2600000>; + regulator-max-microvolt = <3000000>; qcom,hpm-min-load = <30000>; }; };