From d7c1d795c094e8ca2789e673e251180c535af996 Mon Sep 17 00:00:00 2001
From: David Collins <collinsd@quicinc.com>
Date: Mon, 20 Jan 2020 15:33:58 -0800
Subject: [PATCH] ARM: dts: msm: remove CX, MX and MMCX always-on configuration
 for Lahaina

Remove the regulator-always-on configuration flag from VDD_CX,
VDD_MxA, VDD_MxC, and VDD_MMCX regulators.  Also reduce their
minimum allowed operating levels from Turbo to Retention or
LowSVS.

This ensures that these regulators can be scaled down and
disabled in system low power use cases.

Change-Id: I3c3f37cb28fbbb34d5e5bd971669ba4bdda56995
---
 qcom/lahaina-regulators.dtsi | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/qcom/lahaina-regulators.dtsi b/qcom/lahaina-regulators.dtsi
index 9a5f95d8..e2607559 100644
--- a/qcom/lahaina-regulators.dtsi
+++ b/qcom/lahaina-regulators.dtsi
@@ -12,7 +12,7 @@
 			regulator-name = "pm8350_s9_level";
 			qcom,set = <RPMH_REGULATOR_SET_ALL>;
 			regulator-min-microvolt =
-				<RPMH_REGULATOR_LEVEL_TURBO>;
+				<RPMH_REGULATOR_LEVEL_RETENTION>;
 			regulator-max-microvolt =
 				<RPMH_REGULATOR_LEVEL_MAX>;
 			qcom,init-voltage-level =
@@ -21,7 +21,6 @@
 			qcom,proxy-consumer-voltage =
 				<RPMH_REGULATOR_LEVEL_TURBO
 				 RPMH_REGULATOR_LEVEL_MAX>;
-			regulator-always-on;
 		};
 
 		VDD_MXC_LEVEL_AO: S9B_LEVEL_AO:
@@ -60,7 +59,7 @@
 			qcom,set = <RPMH_REGULATOR_SET_ALL>;
 			pm8350_s5_level-parent-supply = <&VDD_MXC_LEVEL>;
 			regulator-min-microvolt =
-				<RPMH_REGULATOR_LEVEL_TURBO>;
+				<RPMH_REGULATOR_LEVEL_RETENTION>;
 			regulator-max-microvolt =
 				<RPMH_REGULATOR_LEVEL_MAX>;
 			qcom,init-voltage-level =
@@ -70,7 +69,6 @@
 			qcom,proxy-consumer-voltage =
 				<RPMH_REGULATOR_LEVEL_TURBO
 				 RPMH_REGULATOR_LEVEL_MAX>;
-			regulator-always-on;
 		};
 
 		VDD_MXA_LEVEL_AO: S5B_LEVEL_AO:
@@ -384,7 +382,7 @@
 			qcom,set = <RPMH_REGULATOR_SET_ALL>;
 			pm8350c_s6_level-parent-supply = <&VDD_MXA_LEVEL>;
 			regulator-min-microvolt =
-				<RPMH_REGULATOR_LEVEL_TURBO>;
+				<RPMH_REGULATOR_LEVEL_RETENTION>;
 			regulator-max-microvolt =
 				<RPMH_REGULATOR_LEVEL_MAX>;
 			qcom,init-voltage-level =
@@ -394,7 +392,6 @@
 			qcom,proxy-consumer-voltage =
 				<RPMH_REGULATOR_LEVEL_TURBO
 				 RPMH_REGULATOR_LEVEL_MAX>;
-			regulator-always-on;
 		};
 
 		VDD_CX_LEVEL_AO: S6C_LEVEL_AO:
@@ -435,7 +432,7 @@
 			pm8350c_s8_level-parent-supply =
 				<&VDD_MXA_MMCX_SUPPLY_LEVEL>;
 			regulator-min-microvolt =
-				<RPMH_REGULATOR_LEVEL_TURBO>;
+				<RPMH_REGULATOR_LEVEL_LOW_SVS>;
 			regulator-max-microvolt =
 				<RPMH_REGULATOR_LEVEL_MAX>;
 			qcom,init-voltage-level =
@@ -445,7 +442,6 @@
 			qcom,proxy-consumer-voltage =
 				<RPMH_REGULATOR_LEVEL_TURBO
 				 RPMH_REGULATOR_LEVEL_MAX>;
-			regulator-always-on;
 		};
 
 		VDD_MMCX_LEVEL_AO: S8C_LEVEL_AO: VDD_MM_LEVEL_AO: