From 5388a280cd1dcc59bee4e331c5cdd8989a40b036 Mon Sep 17 00:00:00 2001
From: Shyam Kumar Thella <sthella@qti.qualcomm.com>
Date: Thu, 6 May 2021 19:15:09 +0530
Subject: [PATCH 1/2] ARM: dts: msm: Remove stub regulators from monaco rumi

Remove including stub regulators in monaco-rumi.dtsi as it is
already included in monaco.dtsi.

Change-Id: Iba5c065b3aca718328ed9466191bdcd8bffc65b3
---
 qcom/monaco-rumi.dtsi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qcom/monaco-rumi.dtsi b/qcom/monaco-rumi.dtsi
index 4e6335d2a9d0..0d2189e70578 100644
--- a/qcom/monaco-rumi.dtsi
+++ b/qcom/monaco-rumi.dtsi
@@ -13,7 +13,6 @@
 
 };
 
-#include "monaco-stub-regulator.dtsi"
 &sdhc_1 {
 	status = "ok";
 

From 5d4a3ce267faf5c972e6c208b09b5ab82bb6ade2 Mon Sep 17 00:00:00 2001
From: Shyam Kumar Thella <sthella@qti.qualcomm.com>
Date: Thu, 6 May 2021 19:00:00 +0530
Subject: [PATCH 2/2] ARM: dts: msm: Remove RPMh macros from monaco-regulators

Remove RPMh macros from monaco-regulators.dtsi as it is RPM_SMD based
design.

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

diff --git a/qcom/monaco-regulators.dtsi b/qcom/monaco-regulators.dtsi
index ff520cff6add..99d06dca19eb 100644
--- a/qcom/monaco-regulators.dtsi
+++ b/qcom/monaco-regulators.dtsi
@@ -155,11 +155,11 @@
 			regulator-max-microvolt =
 				<RPM_SMD_REGULATOR_LEVEL_BINNING>;
 			qcom,init-voltage-level =
-				<RPMH_REGULATOR_LEVEL_TURBO>;
+				<RPM_SMD_REGULATOR_LEVEL_TURBO>;
 			qcom,proxy-consumer-enable;
 			qcom,proxy-consumer-voltage =
-				<RPMH_REGULATOR_LEVEL_TURBO
-				 RPMH_REGULATOR_LEVEL_BINNING>;
+				<RPM_SMD_REGULATOR_LEVEL_TURBO
+				 RPM_SMD_REGULATOR_LEVEL_BINNING>;
 			qcom,use-voltage-level;
 		};
 
@@ -174,7 +174,7 @@
 			regulator-max-microvolt =
 				<RPM_SMD_REGULATOR_LEVEL_BINNING>;
 			qcom,init-voltage-level =
-				<RPMH_REGULATOR_LEVEL_RETENTION>;
+				<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
 			qcom,use-voltage-level;
 		};