From 9793f0d567099b7e672971856c976acdf173163a Mon Sep 17 00:00:00 2001
From: Jishnu Prakash <jprakash@qti.qualcomm.com>
Date: Thu, 24 Dec 2020 10:43:34 +0530
Subject: [PATCH] ARM: dts: msm: Update regulators for yupik

Remove PM7325 LDO 10B as it does not have any direct clients.
Expose PM8350B LDO 1D only on platforms having PM8350B.

Change-Id: Ia03cd7378b3f093a5bb8c674939af15246c781ed
---
 qcom/yupik-atp.dtsi        | 22 ++++++++++++++++++++++
 qcom/yupik-qrd.dtsi        | 22 ++++++++++++++++++++++
 qcom/yupik-regulators.dtsi | 38 --------------------------------------
 3 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/qcom/yupik-atp.dtsi b/qcom/yupik-atp.dtsi
index 09214819936b..bcf6f5d1242d 100644
--- a/qcom/yupik-atp.dtsi
+++ b/qcom/yupik-atp.dtsi
@@ -1,4 +1,5 @@
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/regulator/qcom,rpmh-regulator-levels.h>
 #include "yupik-pmic-overlay.dtsi"
 #include "pm8350b.dtsi"
 
@@ -124,6 +125,27 @@
 	};
 };
 
+&apps_rsc {
+	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 = <1100000>;
+			regulator-max-microvolt = <1300000>;
+			qcom,init-voltage = <1100000>;
+			qcom,init-mode = <RPMH_REGULATOR_MODE_HPM>;
+		};
+	};
+};
+
 &spmi_debug_bus {
 	status = "ok";
 };
diff --git a/qcom/yupik-qrd.dtsi b/qcom/yupik-qrd.dtsi
index eb1c79491267..97bb75f28f1e 100644
--- a/qcom/yupik-qrd.dtsi
+++ b/qcom/yupik-qrd.dtsi
@@ -1,4 +1,5 @@
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/regulator/qcom,rpmh-regulator-levels.h>
 #include <dt-bindings/iio/qcom,spmi-adc7-smb139x.h>
 #include "yupik-pmic-overlay.dtsi"
 #include "pm8350b.dtsi"
@@ -191,6 +192,27 @@
 	};
 };
 
+&apps_rsc {
+	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 = <1100000>;
+			regulator-max-microvolt = <1300000>;
+			qcom,init-voltage = <1100000>;
+			qcom,init-mode = <RPMH_REGULATOR_MODE_HPM>;
+		};
+	};
+};
+
 &spmi_debug_bus {
 	status = "ok";
 };
diff --git a/qcom/yupik-regulators.dtsi b/qcom/yupik-regulators.dtsi
index 9e45d4640ba9..40161ad79780 100644
--- a/qcom/yupik-regulators.dtsi
+++ b/qcom/yupik-regulators.dtsi
@@ -221,25 +221,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 = <1200000>;
-			regulator-max-microvolt = <1200000>;
-			qcom,init-voltage = <1200000>;
-			qcom,init-mode = <RPMH_REGULATOR_MODE_HPM>;
-		};
-	};
-
 	rpmh-regulator-ldob11 {
 		compatible = "qcom,rpmh-vrm-regulator";
 		qcom,resource-name = "ldob11";
@@ -798,25 +779,6 @@
 		};
 	};
 
-	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 = <1100000>;
-			regulator-max-microvolt = <1300000>;
-			qcom,init-voltage = <1100000>;
-			qcom,init-mode = <RPMH_REGULATOR_MODE_HPM>;
-		};
-	};
-
 	rpmh-regulator-ldoe2 {
 		compatible = "qcom,rpmh-vrm-regulator";
 		qcom,resource-name = "ldoe2";