From 4c56a5f2f3ae380f304e67cc63d92a27d4a7b002 Mon Sep 17 00:00:00 2001 From: Kavya Nunna Date: Fri, 18 Oct 2024 11:47:23 +0530 Subject: [PATCH] ARM: dts: msm: Update RPMH regulator voltages for tuna Update the RPMH regulator's min/max voltages based on latest HW recommendation. While at it add FMD changes for WCN attaches. trim the level regulator names to avoid buffer length issues for regulator names. Change-Id: Ib2c99e58fc66ad6a05d43faffdce473ed94b6005 Signed-off-by: Kavya Nunna --- qcom/platform_map.bzl | 1 + qcom/tuna-mtp-kiwi.dtsi | 8 + qcom/tuna-regulators.dtsi | 382 ++++++++++++++++++++------------------ 3 files changed, 208 insertions(+), 183 deletions(-) diff --git a/qcom/platform_map.bzl b/qcom/platform_map.bzl index 95d31391..5f9b9b75 100644 --- a/qcom/platform_map.bzl +++ b/qcom/platform_map.bzl @@ -87,6 +87,7 @@ _platform_map = { {"name": "tuna-cdp-overlay.dtbo"}, {"name": "tuna-mtp-kiwi-harmonium-overlay.dtbo"}, {"name": "tuna-mtp-kiwi-overlay.dtbo"}, + {"name": "tuna-mtp-kiwi-pmd802x-overlay.dtbo"}, {"name": "tuna-mtp-nfc-overlay.dtbo"}, {"name": "tuna-mtp-overlay.dtbo"}, {"name": "tuna-mtp-qmp1000-overlay.dtbo"}, diff --git a/qcom/tuna-mtp-kiwi.dtsi b/qcom/tuna-mtp-kiwi.dtsi index 386415d7..3b78f90d 100644 --- a/qcom/tuna-mtp-kiwi.dtsi +++ b/qcom/tuna-mtp-kiwi.dtsi @@ -4,3 +4,11 @@ */ #include "tuna-mtp.dtsi" + +&S1G_ALT { + status = "ok"; +}; + +&L3G { + regulator-always-on; +}; diff --git a/qcom/tuna-regulators.dtsi b/qcom/tuna-regulators.dtsi index fd4dd00a..0fca820e 100644 --- a/qcom/tuna-regulators.dtsi +++ b/qcom/tuna-regulators.dtsi @@ -9,8 +9,8 @@ rpmh-regulator-smpb1 { compatible = "qcom,rpmh-vrm-regulator"; qcom,resource-name = "smpb1"; - S1B: - pmxr2230_s1: regulator-pmxr2230-s1 { + + S1B: pmxr2230_s1: vreg-pmxr2230-s1 { regulator-name = "pmxr2230_s1"; qcom,set = ; regulator-min-microvolt = <1856000>; @@ -22,8 +22,8 @@ rpmh-regulator-smpb2 { compatible = "qcom,rpmh-vrm-regulator"; qcom,resource-name = "smpb2"; - S2B: - pmxr2230_s2: regulator-pmxr2230-s2 { + + S2B: pmxr2230_s2: vreg-pmxr2230-s2 { regulator-name = "pmxr2230_s2"; qcom,set = ; regulator-min-microvolt = <1256000>; @@ -35,8 +35,8 @@ rpmh-regulator-smpb3 { compatible = "qcom,rpmh-vrm-regulator"; qcom,resource-name = "smpb3"; - S3B: - pmxr2230_s3: regulator-pmxr2230-s3 { + + S3B: pmxr2230_s3: vreg-pmxr2230-s3 { regulator-name = "pmxr2230_s3"; qcom,set = ; regulator-min-microvolt = <880000>; @@ -51,10 +51,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L1B: - pmxr2230_l1: regulator-pmxr2230-l1 { + + L1B: pmxr2230_l1: vreg-pmxr2230-l1 { regulator-name = "pmxr2230_l1"; qcom,set = ; regulator-min-microvolt = <866000>; @@ -70,14 +70,14 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L2B: - pmxr2230_l2: regulator-pmxr2230-l2 { + + L2B: pmxr2230_l2: vreg-pmxr2230-l2 { regulator-name = "pmxr2230_l2"; qcom,set = ; regulator-min-microvolt = <880000>; - regulator-max-microvolt = <950000>; + regulator-max-microvolt = <925000>; qcom,init-voltage = <880000>; qcom,init-mode = ; }; @@ -89,14 +89,14 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L3B: - pmxr2230_l3: regulator-pmxr2230-l3 { + + L3B: pmxr2230_l3: vreg-pmxr2230-l3 { regulator-name = "pmxr2230_l3"; qcom,set = ; - regulator-min-microvolt = <831000>; - regulator-max-microvolt = <919000>; + regulator-min-microvolt = <720000>; + regulator-max-microvolt = <950000>; qcom,init-voltage = <880000>; qcom,init-mode = ; }; @@ -108,10 +108,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L4B: - pmxr2230_l4: regulator-pmxr2230-l4 { + + L4B: pmxr2230_l4: vreg-pmxr2230-l4 { regulator-name = "pmxr2230_l4"; qcom,set = ; regulator-min-microvolt = <1200000>; @@ -127,11 +127,11 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_LPM + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 10000 30000>; - L5B: - pmxr2230_l5: regulator-pmxr2230-l5 { + + L5B: pmxr2230_l5: vreg-pmxr2230-l5 { regulator-name = "pmxr2230_l5"; qcom,set = ; regulator-min-microvolt = <1200000>; @@ -147,10 +147,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L6B: - pmxr2230_l6: regulator-pmxr2230-l6 { + + L6B: pmxr2230_l6: vreg-pmxr2230-l6 { regulator-name = "pmxr2230_l6"; qcom,set = ; regulator-min-microvolt = <1170000>; @@ -166,10 +166,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L7B: - pmxr2230_l7: regulator-pmxr2230-l7 { + + L7B: pmxr2230_l7: vreg-pmxr2230-l7 { regulator-name = "pmxr2230_l7"; qcom,set = ; regulator-min-microvolt = <1800000>; @@ -185,10 +185,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L8B: - pmxr2230_l8: regulator-pmxr2230-l8 { + + L8B: pmxr2230_l8: vreg-pmxr2230-l8 { regulator-name = "pmxr2230_l8"; qcom,set = ; regulator-min-microvolt = <1800000>; @@ -204,10 +204,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L9B: - pmxr2230_l9: regulator-pmxr2230-l9 { + + L9B: pmxr2230_l9: vreg-pmxr2230-l9 { regulator-name = "pmxr2230_l9"; qcom,set = ; regulator-min-microvolt = <756000>; @@ -223,10 +223,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L10B: - pmxr2230_l10: regulator-pmxr2230-l10 { + + L10B: pmxr2230_l10: vreg-pmxr2230-l10 { regulator-name = "pmxr2230_l10"; qcom,set = ; regulator-min-microvolt = <866000>; @@ -242,13 +242,13 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L11B: - pmxr2230_l11: regulator-pmxr2230-l11 { + + L11B: pmxr2230_l11: vreg-pmxr2230-l11 { regulator-name = "pmxr2230_l11"; qcom,set = ; - regulator-min-microvolt = <1620000>; + regulator-min-microvolt = <1080000>; regulator-max-microvolt = <2000000>; qcom,init-voltage = <1800000>; qcom,init-mode = ; @@ -261,10 +261,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 10000>; - L12B: - pmxr2230_l12: regulator-pmxr2230-l12 { + + L12B: pmxr2230_l12: vreg-pmxr2230-l12 { regulator-name = "pmxr2230_l12"; qcom,set = ; regulator-min-microvolt = <2400000>; @@ -280,10 +280,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 10000>; - L13B: - pmxr2230_l13: regulator-pmxr2230-l13 { + + L13B: pmxr2230_l13: vreg-pmxr2230-l13 { regulator-name = "pmxr2230_l13"; qcom,set = ; regulator-min-microvolt = <2700000>; @@ -299,10 +299,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 10000>; - L14B: - pmxr2230_l14: regulator-pmxr2230-l14 { + + L14B: pmxr2230_l14: vreg-pmxr2230-l14 { regulator-name = "pmxr2230_l14"; qcom,set = ; regulator-min-microvolt = <1504000>; @@ -318,10 +318,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 10000>; - L15B: - pmxr2230_l15: regulator-pmxr2230-l15 { + + L15B: pmxr2230_l15: vreg-pmxr2230-l15 { regulator-name = "pmxr2230_l15"; qcom,set = ; regulator-min-microvolt = <1620000>; @@ -337,10 +337,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 10000>; - L16B: - pmxr2230_l16: regulator-pmxr2230-l16 { + + L16B: pmxr2230_l16: vreg-pmxr2230-l16 { regulator-name = "pmxr2230_l16"; qcom,set = ; regulator-min-microvolt = <2600000>; @@ -356,10 +356,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 10000>; - L17B: - pmxr2230_l17: regulator-pmxr2230-l17 { + + L17B: pmxr2230_l17: vreg-pmxr2230-l17 { regulator-name = "pmxr2230_l17"; qcom,set = ; regulator-min-microvolt = <2700000>; @@ -375,10 +375,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 10000>; - L18B: - pmxr2230_l18: regulator-pmxr2230-l18 { + + L18B: pmxr2230_l18: vreg-pmxr2230-l18 { regulator-name = "pmxr2230_l18"; qcom,set = ; regulator-min-microvolt = <1600000>; @@ -394,10 +394,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 10000>; - L19B: - pmxr2230_l19: regulator-pmxr2230-l19 { + + L19B: pmxr2230_l19: vreg-pmxr2230-l19 { regulator-name = "pmxr2230_l19"; qcom,set = ; regulator-min-microvolt = <2650000>; @@ -413,10 +413,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 10000>; - L20B: - pmxr2230_l20: regulator-pmxr2230-l20 { + + L20B: pmxr2230_l20: vreg-pmxr2230-l20 { regulator-name = "pmxr2230_l20"; qcom,set = ; regulator-min-microvolt = <1504000>; @@ -432,10 +432,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 10000>; - L21B: - pmxr2230_l21: regulator-pmxr2230-l21 { + + L21B: pmxr2230_l21: vreg-pmxr2230-l21 { regulator-name = "pmxr2230_l21"; qcom,set = ; regulator-min-microvolt = <1504000>; @@ -451,10 +451,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 10000>; - L22B: - pmxr2230_l22: regulator-pmxr2230-l22 { + + L22B: pmxr2230_l22: vreg-pmxr2230-l22 { regulator-name = "pmxr2230_l22"; qcom,set = ; regulator-min-microvolt = <2700000>; @@ -470,10 +470,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 10000>; - L23B: - pmxr2230_l23: regulator-pmxr2230-l23 { + + L23B: pmxr2230_l23: vreg-pmxr2230-l23 { regulator-name = "pmxr2230_l23"; qcom,set = ; regulator-min-microvolt = <1650000>; @@ -489,11 +489,11 @@ qcom,regulator-type = "pmic5-bob"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_LPM + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 1000000 2000000>; - BOB: - pmxr2230_bob: regulator-pmxr2230-bob1 { + + BOB: pmxr2230_bob: vreg-pmxr2230-bob1 { regulator-name = "pmxr2230_bob"; qcom,set = ; regulator-min-microvolt = <3008000>; @@ -505,9 +505,10 @@ rpmh-regulator-msslvl { compatible = "qcom,rpmh-arc-regulator"; qcom,resource-name = "mss.lvl"; + VDD_MODEM_LEVEL: S1D_LEVEL: - pm_v6d_s1_level: regulator-pm_v6d-s1-level { + pm_v6d_s1_level: vreg-pm_v6d-s1-level { regulator-name = "pm_v6d_s1_level"; qcom,set = ; regulator-min-microvolt = @@ -521,9 +522,10 @@ rpmh-regulator-nsplvl { compatible = "qcom,rpmh-arc-regulator"; qcom,resource-name = "nsp.lvl"; + VDD_NSP1_LEVEL: S4D_LEVEL: - pm_v6d_s4_level: regulator-pm_v6d-s4-level { + pm_v6d_s4_level: vreg-pm_v6d-s4-level { regulator-name = "pm-v6d_s4_level"; qcom,set = ; regulator-min-microvolt = @@ -537,9 +539,10 @@ rpmh-regulator-gfxlvl { compatible = "qcom,rpmh-arc-regulator"; qcom,resource-name = "gfx.lvl"; + VDD_GFX_LEVEL: S5F_LEVEL: - pm_v8f_s5_level: regulator-pm_v8f-s5-level { + pm_v8f_s5_level: vreg-pm_v8f-s5-level { regulator-name = "pm_v8f_s5_level"; qcom,set = ; regulator-min-microvolt = @@ -556,7 +559,7 @@ proxy-supply = <&VDD_MMCX_LEVEL>; VDD_MMCX_LEVEL: VDD_MM_LEVEL: S2F_LEVEL: - pm_v8f_s2_level: regulator-pm-v8f-s2-level { + pm_v8f_s2_level: vreg-pm-v8f-s2-level { regulator-name = "pm_v8f_s2_level"; qcom,set = ; regulator-min-microvolt = @@ -572,7 +575,7 @@ }; VDD_MMCX_LEVEL_AO: VDD_MM_LEVEL_AO: S2F_LEVEL_AO: - pm_v8f_s2_level_ao: regulator-pm-v8f-s2-level-ao { + pm_v8f_s2_level_ao: vreg-pm-v8f-s2-level-ao { regulator-name = "pm_v8f_s2_level_ao"; qcom,set = ; regulator-min-microvolt = @@ -583,7 +586,7 @@ ; }; - regulator-pm-v8f-s2-level-so { + vreg-pm-v8f-s2-level-so { regulator-name = "pm_v8i_s2_level_so"; qcom,set = ; regulator-min-microvolt = @@ -602,7 +605,7 @@ VDD_MXC_LEVEL: S2D_LEVEL: - pm_v6d_s2_level: regulator-pm_v6d-s2-level { + pm_v6d_s2_level: vreg-pm_v6d-s2-level { regulator-name = "pm_v6d_s2_level"; qcom,set = ; regulator-min-microvolt = @@ -618,7 +621,7 @@ VDD_MXC_LEVEL_AO: S2D_LEVEL_AO: - pm_v6d_s2_level_ao: regulator-pm_v6d-s2-level-ao { + pm_v6d_s2_level_ao: vreg-pm_v6d-s2-level-ao { regulator-name = "pm_v6d_s2_level_ao"; qcom,set = ; regulator-min-microvolt = @@ -629,7 +632,7 @@ }; VDD_MXC_MMCX_VOTER_LEVEL: VDD_MXC_MM_VOTER_LEVEL: - VDD_MM_MXC_VOTER_LEVEL: regulator-pm_v6d-s2-mmcx-voter-level { + VDD_MM_MXC_VOTER_LEVEL: vreg-pm_v6d-s2-mmcx-voter-level { regulator-name = "pm_v6d_s2_mmcx_voter_level"; pm_v6d_s2_mmcx_voter_level-parent-supply = <&VDD_MMCX_LEVEL>; @@ -643,7 +646,7 @@ }; VDD_MXC_GFX_VOTER_LEVEL: VDD_GFX_MXC_VOTER_LEVEL: - regulator-pm_v6d-s2-gfx-voter-level { + vreg-pm_v6d-s2-gfx-voter-level { regulator-name = "pm_v6d_s2_gfx_voter_level"; pm_v6d_s2_gfx_voter_level-parent-supply = <&VDD_GFX_LEVEL>; qcom,set = ; @@ -659,8 +662,8 @@ rpmh-regulator-smpd3 { compatible = "qcom,rpmh-vrm-regulator"; qcom,resource-name = "smpd3"; - S3D: - pm_v6d_s3: regulator-pm_v6d-s3 { + + S3D: pm_v6d_s3: vreg-pm_v6d-s3 { regulator-name = "pm_v6d_s3"; qcom,set = ; regulator-min-microvolt = <870000>; @@ -675,10 +678,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L1D: - pm_v6d_l1: regulator-pm_v6d-l1 { + + L1D: pm_v6d_l1: vreg-pm_v6d-l1 { regulator-name = "pm_v6d_l1"; qcom,set = ; regulator-min-microvolt = <1710000>; @@ -691,9 +694,10 @@ rpmh-regulator-lmxlvl { compatible = "qcom,rpmh-arc-regulator"; qcom,resource-name = "lmx.lvl"; + VDD_LPI_MX_LEVEL: L2D_LEVEL: - pm_v6d_l2_level: regulator-pm_v6d-l2-level { + pm_v6d_l2_level: vreg-pm_v6d-l2-level { regulator-name = "pm_v6d_l2_level"; qcom,set = ; regulator-min-microvolt = @@ -710,10 +714,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L3D: - pm_v6d_l3: regulator-pm_v6d-l3 { + + L3D: pm_v6d_l3: vreg-pm_v6d-l3 { regulator-name = "pm_v6d_l3"; qcom,set = ; regulator-min-microvolt = <1030000>; @@ -730,7 +734,7 @@ VDD_CX_LEVEL: S1F_LEVEL: - pm_v8f_s1_level: regulator-pm_v8f-s1-level { + pm_v8f_s1_level: vreg-pm_v8f-s1-level { regulator-name = "pm_v8f_s1_level"; qcom,set = ; regulator-min-microvolt = @@ -746,7 +750,7 @@ VDD_CX_LEVEL_AO: S1F_LEVEL_AO: - pm_v8f_s1_level_ao: regulator-pm_v8f-s1-level-ao { + pm_v8f_s1_level_ao: vreg-pm_v8f-s1-level-ao { regulator-name = "pm_v8f_s1_level_ao"; qcom,set = ; regulator-min-microvolt = @@ -760,8 +764,8 @@ rpmh-regulator-smpf4 { compatible = "qcom,rpmh-vrm-regulator"; qcom,resource-name = "smpf4"; - S4F: - pm_v8f_s4: regulator-pm_v8f-s4 { + + S4F: pm_v8f_s4: vreg-pm_v8f-s4 { regulator-name = "pm_v8f_s4"; qcom,set = ; regulator-min-microvolt = <300000>; @@ -778,7 +782,7 @@ VDD_MX_LEVEL: VDD_MXA_LEVEL: S8F_LEVEL: - pm_v8f_s8_level: regulator-pm_v8f-s8-level { + pm_v8f_s8_level: vreg-pm_v8f-s8-level { regulator-name = "pm_v8f_s8_level"; qcom,set = ; regulator-min-microvolt = @@ -794,7 +798,7 @@ VDD_MXA_LEVEL_AO: S8F_LEVEL_AO: - pm_v8f_s8_level_ao: regulator-pm_v8f-s8-level-ao { + pm_v8f_s8_level_ao: vreg-pm_v8f-s8-level-ao { regulator-name = "pm_v8f_s8_level_ao"; qcom,set = ; regulator-min-microvolt = @@ -811,10 +815,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L1F: - pm_v8f_l1: regulator-pm_v8f-l1 { + + L1F: pm_v8f_l1: vreg-pm_v8f-l1 { regulator-name = "pm_v8f_l1"; qcom,set = ; regulator-min-microvolt = <866000>; @@ -827,9 +831,10 @@ rpmh-regulator-lcxlvl { compatible = "qcom,rpmh-arc-regulator"; qcom,resource-name = "lcx.lvl"; + VDD_LPI_CX_LEVEL: L2F_LEVEL: - pm_v8f_l2_level: regulator-pm_v8-l2-level { + pm_v8f_l2_level: vreg-pm_v8-l2-level { regulator-name = "pm_v8f_l2_level"; qcom,set = ; regulator-min-microvolt = @@ -846,11 +851,11 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; proxy-supply = <&L3F>; - L3F: - pm_v8f_l3: regulator-pm_v8f-l3 { + + L3F: pm_v8f_l3: vreg-pm_v8f-l3 { regulator-name = "pm_v8f_l3"; qcom,set = ; regulator-min-microvolt = <1200000>; @@ -865,8 +870,8 @@ rpmh-regulator-smpg1 { compatible = "qcom,rpmh-vrm-regulator"; qcom,resource-name = "smpg1"; - S1G: - pm_v6g_s1: regulator-pm_v6g-s1 { + + S1G: pm_v6g_s1: vreg-pm_v6g-s1 { regulator-name = "pm_v6g_s1"; qcom,set = ; regulator-min-microvolt = <2156000>; @@ -878,8 +883,8 @@ rpmh-regulator-smpg2 { compatible = "qcom,rpmh-vrm-regulator"; qcom,resource-name = "smpg2"; - S2G: - pm_v6g_s2: regulator-pm_v6g-s2 { + + S2G: pm_v6g_s2: vreg-pm_v6g-s2 { regulator-name = "pm_v6g_s2"; qcom,set = ; regulator-min-microvolt = <1010000>; @@ -891,9 +896,10 @@ rpmh-regulator-ebilvl { compatible = "qcom,rpmh-arc-regulator"; qcom,resource-name = "ebi.lvl"; + VDD_EBI_LEVEL: S3G_LEVEL: - pm_v6g_s3_level: regulator-pm_v6g-s3-level { + pm_v6g_s3_level: vreg-pm_v6g-s3-level { regulator-name = "pm_v6g_s3_level"; qcom,set = ; regulator-min-microvolt = @@ -904,16 +910,30 @@ }; }; + rpmh-regulator-smpg1_alt { + compatible = "qcom,rpmh-vrm-regulator"; + qcom,resource-name = "smpg1_alt"; + + S1G_ALT: pm_v6g_s1_alt: vreg-pm_v6g-s1_alt { + regulator-name = "pm_v6g_s1_alt"; + qcom,set = ; + regulator-min-microvolt = <806000>; + regulator-max-microvolt = <1003000>; + qcom,init-voltage = <852000>; + status = "disabled"; + }; + }; + rpmh-regulator-ldog1 { compatible = "qcom,rpmh-vrm-regulator"; qcom,resource-name = "ldog1"; qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L1G: - pm_v6g_l1: regulator-pm_v6g-l1 { + + L1G: pm_v6g_l1: vreg-pm_v6g-l1 { regulator-name = "pm_v6g_l1"; qcom,set = ; regulator-min-microvolt = <1600000>; @@ -929,16 +949,17 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L2G: - pm_v6g_l2: regulator-pm_v6g-l2 { + + L2G: pm_v6g_l2: vreg-pm_v6g-l2 { regulator-name = "pm_v6g_l2"; qcom,set = ; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; qcom,init-voltage = <1200000>; qcom,init-mode = ; + regulator-always-on; }; }; @@ -948,10 +969,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L3G: - pm_v6g_l3: regulator-pm_v6g-l3 { + + L3G: pm_v6g_l3: vreg-pm_v6g-l3 { regulator-name = "pm_v6g_l3"; qcom,set = ; regulator-min-microvolt = <1800000>; @@ -964,12 +985,12 @@ rpmh-regulator-smpi1 { compatible = "qcom,rpmh-vrm-regulator"; qcom,resource-name = "smpi1"; - S1I: - pmg1110i_s1: regulator-pmg1110i-s1 { + + S1I: pmg1110i_s1: vreg-pmg1110i-s1 { regulator-name = "pmg1110i_s1"; qcom,set = ; regulator-min-microvolt = <352000>; - regulator-max-microvolt = <1050000>; + regulator-max-microvolt = <952000>; qcom,init-voltage = <892000>; }; }; @@ -977,8 +998,8 @@ rpmh-regulator-smpj1 { compatible = "qcom,rpmh-vrm-regulator"; qcom,resource-name = "smpj1"; - S1J: - pmg1110j_s1: regulator-pmg1110j-s1 { + + S1J: pmg1110j_s1: vreg-pmg1110j-s1 { regulator-name = "pmg1110j_s1"; qcom,set = ; regulator-min-microvolt = <504000>; @@ -993,10 +1014,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L1K: - pmr_nalojr_l1: regulator-pmr-nalojr-l1 { + + L1K: pmr_nalojr_l1: vreg-pmr-nalojr-l1 { regulator-name = "pmr_nalojr_l1"; qcom,set = ; regulator-min-microvolt = <488000>; @@ -1012,10 +1033,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L2K: - pmr_nalojr_l2: regulator-pmr_nalojr_l2 { + + L2K: pmr_nalojr_l2: vreg-pmr_nalojr_l2 { regulator-name = "pmr_nalojr_l2"; qcom,set = ; regulator-min-microvolt = <920000>; @@ -1031,10 +1052,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L3K: - pmr_nalojr_l3: regulator-pmr_nalojr_l3 { + + L3K: pmr_nalojr_l3: vreg-pmr_nalojr_l3 { regulator-name = "pmr_nalojr_l3"; qcom,set = ; regulator-min-microvolt = <1080000>; @@ -1050,10 +1071,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L4K: - pmr_nalojr_l4: regulator-pmr_nalojr_l4 { + + L4K: pmr_nalojr_l4: vreg-pmr_nalojr_l4 { regulator-name = "pmr_nalojr_l4"; qcom,set = ; regulator-min-microvolt = <1200000>; @@ -1069,10 +1090,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L5K: - pmr_nalojr_l5: regulator-pmr_nalojr_l5 { + + L5K: pmr_nalojr_l5: vreg-pmr_nalojr_l5 { regulator-name = "pmr_nalojr_l5"; qcom,set = ; regulator-min-microvolt = <504000>; @@ -1088,10 +1109,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L6K: - pmr_nalojr_l6: regulator-pmr_nalojr_l6 { + + L6K: pmr_nalojr_l6: vreg-pmr_nalojr_l6 { regulator-name = "pmr_nalojr_l6"; qcom,set = ; regulator-min-microvolt = <1100000>; @@ -1107,10 +1128,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L7K: - pmr_nalojr_l7: regulator-pmr_nalojr_l7 { + + L7K: pmr_nalojr_l7: vreg-pmr_nalojr_l7 { regulator-name = "pmr_nalojr_l7"; qcom,set = ; regulator-min-microvolt = <504000>; @@ -1126,10 +1147,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L1M: - pm8010m_l1: regulator-pm8010m-l1 { + + L1M: pm8010m_l1: vreg-pm8010m-l1 { regulator-name = "pm8010m_l1"; qcom,set = ; regulator-min-microvolt = <1000000>; @@ -1145,10 +1166,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L2M: - pm8010m_l2: regulator-pm8010m-l2 { + + L2M: pm8010m_l2: vreg-pm8010m-l2 { regulator-name = "pm8010m_l2"; qcom,set = ; regulator-min-microvolt = <950000>; @@ -1163,7 +1184,7 @@ qcom,resource-name = "ldom3"; L3M: - pm8010m_l3: regulator-pm8010m-l3 { + pm8010m_l3: vreg-pm8010m-l3 { regulator-name = "pm8010m_l3"; qcom,set = ; regulator-min-microvolt = <2700000>; @@ -1177,7 +1198,7 @@ qcom,resource-name = "ldom4"; L4M: - pm8010m_l4: regulator-pm8010m-l4 { + pm8010m_l4: vreg-pm8010m-l4 { regulator-name = "pm8010m_l4"; qcom,set = ; regulator-min-microvolt = <2700000>; @@ -1191,7 +1212,7 @@ qcom,resource-name = "ldom5"; L5M: - pm8010m_l5: regulator-pm8010m-l5 { + pm8010m_l5: vreg-pm8010m-l5 { regulator-name = "pm8010m_l5"; qcom,set = ; regulator-min-microvolt = <1200000>; @@ -1205,7 +1226,7 @@ qcom,resource-name = "ldom6"; L6M: - pm8010m_l6: regulator-pm8010m-l6 { + pm8010m_l6: vreg-pm8010m-l6 { regulator-name = "pm8010m_l6"; qcom,set = ; regulator-min-microvolt = <2700000>; @@ -1219,7 +1240,7 @@ qcom,resource-name = "ldom7"; L7M: - pm8010m_l7: regulator-pm8010m-l7 { + pm8010m_l7: vreg-pm8010m-l7 { regulator-name = "pm8010m_l7"; qcom,set = ; regulator-min-microvolt = <2700000>; @@ -1234,10 +1255,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L1N: - pm8010n_l1: regulator-pm8010n-l1 { + + L1N: pm8010n_l1: vreg-pm8010n-l1 { regulator-name = "pm8010n_l1"; qcom,set = ; regulator-min-microvolt = <1050000>; @@ -1253,10 +1274,10 @@ qcom,regulator-type = "pmic5-ldo"; qcom,supported-modes = ; + RPMH_REGULATOR_MODE_HPM>; qcom,mode-threshold-currents = <0 30000>; - L2N: - pm8010n_l2: regulator-pm8010n-l2 { + + L2N: pm8010n_l2: vreg-pm8010n-l2 { regulator-name = "pm8010n_l2"; qcom,set = ; regulator-min-microvolt = <1050000>; @@ -1270,8 +1291,7 @@ compatible = "qcom,rpmh-vrm-regulator"; qcom,resource-name = "ldon3"; - L3N: - pm8010n_l3: regulator-pm8010n-l3 { + L3N: pm8010n_l3: vreg-pm8010n-l3 { regulator-name = "pm8010n_l3"; qcom,set = ; regulator-min-microvolt = <1792000>; @@ -1284,8 +1304,7 @@ compatible = "qcom,rpmh-vrm-regulator"; qcom,resource-name = "ldon4"; - L4N: - pm8010n_l4: regulator-pm8010n-l4 { + L4N: pm8010n_l4: vreg-pm8010n-l4 { regulator-name = "pm8010n_l4"; qcom,set = ; regulator-min-microvolt = <1792000>; @@ -1298,8 +1317,7 @@ compatible = "qcom,rpmh-vrm-regulator"; qcom,resource-name = "ldon5"; - L5N: - pm8010n_l5: regulator-pm8010n-l5 { + L5N: pm8010n_l5: vreg-pm8010n-l5 { regulator-name = "pm8010n_l5"; qcom,set = ; regulator-min-microvolt = <1504000>; @@ -1312,8 +1330,7 @@ compatible = "qcom,rpmh-vrm-regulator"; qcom,resource-name = "ldon6"; - L6N: - pm8010n_l6: regulator-pm8010n-l6 { + L6N: pm8010n_l6: vreg-pm8010n-l6 { regulator-name = "pm8010n_l6"; qcom,set = ; regulator-min-microvolt = <2700000>; @@ -1326,8 +1343,7 @@ compatible = "qcom,rpmh-vrm-regulator"; qcom,resource-name = "ldon7"; - L7N: - pm8010n_l7: regulator-pm8010n-l7 { + L7N: pm8010n_l7: vreg-pm8010n-l7 { regulator-name = "pm8010n_l7"; qcom,set = ; regulator-min-microvolt = <3130000>;