From 28a715c7b20d748f5b2749a9a9dd415031169e74 Mon Sep 17 00:00:00 2001
From: Kiran Gunda <kgunda@qti.qualcomm.com>
Date: Wed, 5 Aug 2020 15:02:59 +0530
Subject: [PATCH 1/2] ARM: dts: qcom: Add L1D and remove L10B/L7F for shima

Add pm8350b_l1(L1D) which is a supply rail for DDIC for OLEDB
display. Also remove pmr735B_l7(L7F) and pm8350_l10(L10B)
nodes as there is no VRM resource for these LDOs.

Change-Id: Ic6b5ee4fcf2a632d9e7e87468331e16d3e6d33d9
---
 qcom/shima-regulators.dtsi | 56 ++++++++++++--------------------------
 1 file changed, 18 insertions(+), 38 deletions(-)

diff --git a/qcom/shima-regulators.dtsi b/qcom/shima-regulators.dtsi
index 1110397e89d5..a2e2e932cc1e 100644
--- a/qcom/shima-regulators.dtsi
+++ b/qcom/shima-regulators.dtsi
@@ -362,25 +362,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:
-		pm8350_l10: regulator-pm8350-l10 {
-			regulator-name = "pm8350_l10";
-			qcom,set = <RPMH_REGULATOR_SET_ALL>;
-			regulator-min-microvolt = <1170000>;
-			regulator-max-microvolt = <1304000>;
-			qcom,init-voltage = <1170000>;
-			qcom,init-mode = <RPMH_REGULATOR_MODE_HPM>;
-		};
-	};
-
 	rpmh-regulator-smpc1 {
 		compatible = "qcom,rpmh-vrm-regulator";
 		qcom,resource-name = "smpc1";
@@ -682,6 +663,24 @@
 		};
 	};
 
+	rpmh-regulator-ldod1 {
+		compatible = "qcom,rpmh-vrm-regulator";
+		qcom,resource-name = "ldod1";
+		qcom,regulator-type = "pmic5-ldo";
+		qcom,supported-modes =
+			<RPMH_REGULATOR_MODE_LPM
+			 RPMH_REGULATOR_MODE_HPM>;
+		qcom,mode-threshold-currents = <0 30000>;
+		L1D: pm8350b_l1: regulator-pm8350b-l1 {
+			regulator-name = "pm8350b_l1";
+			qcom,set = <RPMH_REGULATOR_SET_ALL>;
+			regulator-min-microvolt = <1200000>;
+			regulator-max-microvolt = <1200000>;
+			qcom,init-voltage = <1200000>;
+			qcom,init-mode = <RPMH_REGULATOR_MODE_HPM>;
+		};
+	};
+
 	rpmh-regulator-ldof1 {
 		compatible = "qcom,rpmh-vrm-regulator";
 		qcom,resource-name = "ldof1";
@@ -796,25 +795,6 @@
 		};
 	};
 
-	rpmh-regulator-ldof7 {
-		compatible = "qcom,rpmh-vrm-regulator";
-		qcom,resource-name = "ldof7";
-		qcom,regulator-type = "pmic5-ldo";
-		qcom,supported-modes =
-			<RPMH_REGULATOR_MODE_LPM
-			RPMH_REGULATOR_MODE_HPM>;
-		qcom,mode-threshold-currents = <0 30000>;
-		L7F:
-		pmr735B_l7: regulator-pmr735B-l7 {
-			regulator-name = "pmr735B_l7";
-			qcom,set = <RPMH_REGULATOR_SET_ALL>;
-			regulator-min-microvolt = <312000>;
-			regulator-max-microvolt = <1304000>;
-			qcom,init-voltage = <312000>;
-			qcom,init-mode = <RPMH_REGULATOR_MODE_HPM>;
-		};
-	};
-
 	rpmh-regulator-ldof8 {
 		compatible = "qcom,rpmh-vrm-regulator";
 		qcom,resource-name = "ldof8";

From 3ee451070b5f5848998357df2d0b6ac966ecdadc Mon Sep 17 00:00:00 2001
From: Kiran Gunda <kgunda@qti.qualcomm.com>
Date: Wed, 12 Aug 2020 12:53:24 +0530
Subject: [PATCH 2/2] ARM: dts: msm: Change the SMPS2C max-voltage to 0.95V for
 shima

Change the SMPS2C max-voltage from 0.925V to 0.95V as per the
HW recommendation.

Change-Id: I622bb85f3d67e687e6bbb5d0253ed997a285d90c
---
 qcom/shima-regulators.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qcom/shima-regulators.dtsi b/qcom/shima-regulators.dtsi
index a2e2e932cc1e..ddb480f0f7b8 100644
--- a/qcom/shima-regulators.dtsi
+++ b/qcom/shima-regulators.dtsi
@@ -383,7 +383,7 @@
 			regulator-name = "pm8350c_s2";
 			qcom,set = <RPMH_REGULATOR_SET_ALL>;
 			regulator-min-microvolt = <722000>;
-			regulator-max-microvolt = <925000>;
+			regulator-max-microvolt = <950000>;
 			qcom,init-voltage = <722000>;
 		};
 	};