From 764ac1e4d89fbcf5b74efc9f2a2a75158fa819f8 Mon Sep 17 00:00:00 2001
From: Ashish Chavan <ashichav@qti.qualcomm.com>
Date: Fri, 26 Nov 2021 17:31:26 +0530
Subject: [PATCH] ARM: dts: msm: Regulator updates for diwali

Following are the updates:

1. Initial MMCX regulator voltage on diwali  is set to
 LEVEL_TURBO(384) causing failure to initialize as max level
 support for this regulator is LEVEL_NOM(256), fix this by
 changing initial voltage for this regulator from
 RPMH_REGULATOR_LEVEL_TURBO -> RPMH_REGULATOR_LEVEL_NOM.

2. Unable to get resource names for L10B and L2C as they are
 not specified in cmd-db as there are no clients on them to
 vote on. Fix this by removing these nodes.

3. Observing initial voltage of  L7B to be set to 2.4v(min)
 from regulator framework as part of regulator registration where
 if the initial voltage is not set we vote for min voltage on it.
 This regulator will only be voted for enabling/disabling
 conditions by UFS, fix this by removing the min/max voltage values
 for this regulator.

Change-Id: I22cae85613a9da05e18b24e06759c278dd113903
---
 qcom/diwali-regulators.dtsi | 50 +++++++------------------------------
 1 file changed, 9 insertions(+), 41 deletions(-)

diff --git a/qcom/diwali-regulators.dtsi b/qcom/diwali-regulators.dtsi
index 5329ede7..d1beb76c 100644
--- a/qcom/diwali-regulators.dtsi
+++ b/qcom/diwali-regulators.dtsi
@@ -140,9 +140,14 @@
 		pm7325_l7: regulator-pm7325-l7 {
 			regulator-name = "pm7325_l7";
 			qcom,set = <RPMH_REGULATOR_SET_ALL>;
-			regulator-min-microvolt = <2400000>;
-			regulator-max-microvolt = <3544000>;
 			qcom,init-mode = <RPMH_REGULATOR_MODE_HPM>;
+			/*
+			 * Remove min/max voltages for this regulator as initial
+			 * voltage of  L7B is set to be 2.504v/2.952v during PON
+			 * depending upon the UFS mode 3.x/2.x. UFS is the only
+			 * client on this and this regulator will only be voted
+			 * for enabling/disabling conditions.
+			 */
 		};
 	};
 
@@ -184,25 +189,6 @@
 		};
 	};
 
-	rpmh-regulator-ldob10 {
-		compatible = "qcom,rpmh-vrm-regulator";
-		qcom,resource-name = "ldob10";
-		qcom,regulator-type = "pmic5-ldo";
-		qcom,supported-modes =
-			<RPMH_REGULATOR_MODE_LPM
-			RPMH_REGULATOR_MODE_HPM>;
-		qcom,mode-threshold-currents = <0 30000>;
-		L10B:
-		pm7325_l10: regulator-pm7325-l10 {
-			regulator-name = "pm7325_l10";
-			qcom,set = <RPMH_REGULATOR_SET_ALL>;
-			regulator-min-microvolt = <1170000>;
-			regulator-max-microvolt = <1304000>;
-			qcom,init-voltage = <1200000>;
-			qcom,init-mode = <RPMH_REGULATOR_MODE_HPM>;
-		};
-	};
-
 	rpmh-regulator-ldob11 {
 		compatible = "qcom,rpmh-vrm-regulator";
 		qcom,resource-name = "ldob11";
@@ -474,24 +460,6 @@
 		};
 	};
 
-	rpmh-regulator-ldoc2 {
-		compatible = "qcom,rpmh-vrm-regulator";
-		qcom,resource-name = "ldoc2";
-		qcom,regulator-type = "pmic5-ldo";
-		qcom,supported-modes =
-			<RPMH_REGULATOR_MODE_LPM
-			 RPMH_REGULATOR_MODE_HPM>;
-		qcom,mode-threshold-currents = <0 10000>;
-		L2C: pm8350c_l2: regulator-pm8350c-l2 {
-			regulator-name = "pm8350c_l2";
-			qcom,set = <RPMH_REGULATOR_SET_ALL>;
-			regulator-min-microvolt = <1620000>;
-			regulator-max-microvolt = <1980000>;
-			qcom,init-voltage = <1620000>;
-			qcom,init-mode = <RPMH_REGULATOR_MODE_HPM>;
-		};
-	};
-
 	rpmh-regulator-ldoc3 {
 		compatible = "qcom,rpmh-vrm-regulator";
 		qcom,resource-name = "ldoc3";
@@ -816,10 +784,10 @@
 			regulator-max-microvolt =
 				<RPMH_REGULATOR_LEVEL_MAX>;
 			qcom,init-voltage-level =
-				<RPMH_REGULATOR_LEVEL_TURBO>;
+				<RPMH_REGULATOR_LEVEL_NOM>;
 			qcom,proxy-consumer-enable;
 			qcom,proxy-consumer-voltage =
-				<RPMH_REGULATOR_LEVEL_TURBO
+				<RPMH_REGULATOR_LEVEL_NOM
 				 RPMH_REGULATOR_LEVEL_MAX>;
 		};