From 4c0d6ea405376d032b942711884a958ea6ddadd1 Mon Sep 17 00:00:00 2001
From: David Collins <collinsd@quicinc.com>
Date: Mon, 23 Sep 2019 15:36:10 -0700
Subject: [PATCH] ARM: dts: qcom: switch PM8350 LDO 7 to RPMh control for
 Lahaina

Now that RPMh supports the higher voltages needed from PM8350
LDO 7, replace the stub-regulator device for PM8350 LDO 7 with an
rpmh-regulator device.  This ensures that consumers are able to
modify the physical state of this PMIC regulator.

Change-Id: I370622f9cb309f50b4ed7cff57807436ae3cd31f
---
 qcom/lahaina-regulators.dtsi | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/qcom/lahaina-regulators.dtsi b/qcom/lahaina-regulators.dtsi
index 6c991a48..2fd73892 100644
--- a/qcom/lahaina-regulators.dtsi
+++ b/qcom/lahaina-regulators.dtsi
@@ -224,6 +224,24 @@
 		};
 	};
 
+	rpmh-regulator-ldob7 {
+		compatible = "qcom,rpmh-vrm-regulator";
+		qcom,resource-name = "ldob7";
+		qcom,regulator-type = "pmic5-ldo";
+		qcom,supported-modes =
+			<RPMH_REGULATOR_MODE_LPM
+			 RPMH_REGULATOR_MODE_HPM>;
+		qcom,mode-threshold-currents = <0 10000>;
+		L7B: pm8350_l7: regulator-pm8350-l7 {
+			regulator-name = "pm8350_l7";
+			qcom,set = <RPMH_REGULATOR_SET_ALL>;
+			regulator-min-microvolt = <1704000>;
+			regulator-max-microvolt = <3600000>;
+			qcom,init-voltage = <2504000>;
+			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;
+		};
+	};
+
 	rpmh-regulator-lcxlvl {
 		compatible = "qcom,rpmh-arc-regulator";
 		qcom,resource-name = "lcx.lvl";
@@ -834,14 +852,6 @@
 
 /* Stub regulators: */
 / {
-	L7B: pm8350_l7: regulator-pm8350-l7 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8350_l7";
-		regulator-min-microvolt = <1704000>;
-		regulator-max-microvolt = <3600000>;
-		qcom,hpm-min-load = <10000>;
-	};
-
 	L1I: pm8008i_l1: regulator-pm8008i-l1 {
 		compatible = "qcom,stub-regulator";
 		regulator-name = "pm8008i_l1";