ARM: dts: msm: switch to RPM control for regulators on MSMFALCON

Convert most of the pmfalcon stub-regulator devices to a
rpm-smd-regulator devices. This ensures that requests made for
these regulators are aggregated by the RPM processor along with
the requests from other processors.
Also, add a dummy gfx_vreg_corner regulator until the CPR node
is added.

While at it, rename all regulators names and add pm/pm2 prefix
to differentiate between regulators on multiple supported PMICs.
Also update all clients with new regulator phandles.

CRs-Fixed: 1077493
Change-Id: I95b17de5bf17b62096d2c9d60633b6b30768752a
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>

8 files changed, 1028 insertions, 426 deletions

diff --git a/arch/arm/boot/dts/qcom/msm-pm2falcon-rpm-regulator.dtsi b/arch/arm/boot/dts/qcom/msm-pm2falcon-rpm-regulator.dtsi
new file mode 100644
index 000000000000..f500079e6953
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/msm-pm2falcon-rpm-regulator.dtsi
@@ -0,0 +1,238 @@
+/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+&rpm_bus {
+	rpm-regulator-smpb1 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "smpb";
+		qcom,resource-id = <1>;
+		qcom,regulator-type = <1>;
+		status = "disabled";
+
+		regulator-s1 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_s1";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-smpb2 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "smpb";
+		qcom,resource-id = <2>;
+		qcom,regulator-type = <1>;
+		status = "disabled";
+
+		regulator-s2 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_s2";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-smpb3 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "smpb";
+		qcom,resource-id = <3>;
+		qcom,regulator-type = <1>;
+		status = "disabled";
+
+		regulator-s3 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_s3";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-smpb5 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "smpb";
+		qcom,resource-id = <5>;
+		qcom,regulator-type = <1>;
+		status = "disabled";
+
+		regulator-s5 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_s5";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldob1 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "ldob";
+		qcom,resource-id = <1>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l1 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_l1";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldob2 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "ldob";
+		qcom,resource-id = <2>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l2 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_l2";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldob3 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "ldob";
+		qcom,resource-id = <3>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l3 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_l3";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldob4 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "ldob";
+		qcom,resource-id = <4>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l4 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_l4";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldob5 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "ldob";
+		qcom,resource-id = <5>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l5 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_l5";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldob6 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "ldob";
+		qcom,resource-id = <6>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l6 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_l6";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldob7 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "ldob";
+		qcom,resource-id = <7>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l7 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_l7";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldob8 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "ldob";
+		qcom,resource-id = <8>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l8 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_l8";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldob9 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "rwsc";
+		qcom,resource-id = <9>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l9 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_l9";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldob10 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "rwsm";
+		qcom,resource-id = <10>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l10 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_l10";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-bobb {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "bobb";
+		qcom,resource-id = <1>;
+		qcom,regulator-type = <4>;
+		status = "disabled";
+
+		regulator-bob {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_bob";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+};
diff --git a/arch/arm/boot/dts/qcom/msm-pmfalcon-rpm-regulator.dtsi b/arch/arm/boot/dts/qcom/msm-pmfalcon-rpm-regulator.dtsi
new file mode 100644
index 000000000000..0b625bf04ef5
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/msm-pmfalcon-rpm-regulator.dtsi
@@ -0,0 +1,298 @@
+/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+&rpm_bus {
+	rpm-regulator-smpa4 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "smpa";
+		qcom,resource-id = <4>;
+		qcom,regulator-type = <1>;
+		status = "disabled";
+
+		regulator-s4 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pmfalcon_s4";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-smpa5 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "smpa";
+		qcom,resource-id = <5>;
+		qcom,regulator-type = <1>;
+		status = "disabled";
+
+		regulator-s5 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pmfalcon_s5";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-smpa6 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "smpa";
+		qcom,resource-id = <6>;
+		qcom,regulator-type = <1>;
+		status = "disabled";
+
+		regulator-s6 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pmfalcon_s6";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldoa1 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "ldoa";
+		qcom,resource-id = <1>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l1 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pmfalcon_l1";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldoa2 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "ldoa";
+		qcom,resource-id = <2>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l2 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pmfalcon_l2";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldoa3 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "ldoa";
+		qcom,resource-id = <3>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l3 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pmfalcon_l3";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldoa5 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "ldoa";
+		qcom,resource-id = <5>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l5 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pmfalcon_l5";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldoa6 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "ldoa";
+		qcom,resource-id = <6>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l6 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pmfalcon_l6";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldoa7 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "ldoa";
+		qcom,resource-id = <7>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l7 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pmfalcon_l7";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldoa8 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "ldoa";
+		qcom,resource-id = <8>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l8 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pmfalcon_l8";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldoa9 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "ldoa";
+		qcom,resource-id = <9>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l9 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pmfalcon_l9";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldoa10 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "ldoa";
+		qcom,resource-id = <10>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l10 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pmfalcon_l10";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldoa11 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "ldoa";
+		qcom,resource-id = <11>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l11 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pmfalcon_l11";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldoa12 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "ldoa";
+		qcom,resource-id = <12>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l12 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pmfalcon_l12";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldoa13 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "ldoa";
+		qcom,resource-id = <13>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l13 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pmfalcon_l13";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldoa14 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "ldoa";
+		qcom,resource-id = <14>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l14 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pmfalcon_l14";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldoa15 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "ldoa";
+		qcom,resource-id = <15>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l15 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pmfalcon_l15";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldoa17 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "ldoa";
+		qcom,resource-id = <17>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l17 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pmfalcon_l17";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+
+	rpm-regulator-ldoa19 {
+		compatible = "qcom,rpm-smd-regulator-resource";
+		qcom,resource-name = "ldoa";
+		qcom,resource-id = <19>;
+		qcom,regulator-type = <0>;
+		status = "disabled";
+
+		regulator-l19 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pmfalcon_l19";
+			qcom,set = <3>;
+			status = "disabled";
+		};
+	};
+};
diff --git a/arch/arm/boot/dts/qcom/msmfalcon-regulator.dtsi b/arch/arm/boot/dts/qcom/msmfalcon-regulator.dtsi
index 124ab341ba6b..75cf4de97672 100644
--- a/arch/arm/boot/dts/qcom/msmfalcon-regulator.dtsi
+++ b/arch/arm/boot/dts/qcom/msmfalcon-regulator.dtsi
@@ -10,351 +10,415 @@
  * GNU General Public License for more details.
  */
 
-/* Stub regulators */
-
-/ {
-	/* PMFALCON S1 - VDD_APC0 supply */
-	pmfalcon_s1a: regulator-pmfalcon-s1a {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s1a";
-		qcom,hpm-min-load = <100000>;
-		regulator-min-microvolt = <565000>;
-		regulator-max-microvolt = <1170000>;
-	};
-
-	/* PMFALCON S2 + S3 = VDD_APC1 supply */
-	pmfalcon_s2a: regulator-pmfalcon-s2a {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s2a";
-		qcom,hpm-min-load = <100000>;
-		regulator-min-microvolt = <565000>;
-		regulator-max-microvolt = <1170000>;
-	};
-
-	pmfalcon_s4a: regulator-pmfalcon-s4a {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s4a";
-		qcom,hpm-min-load = <100000>;
-		regulator-min-microvolt = <1805000>;
-		regulator-max-microvolt = <2040000>;
-	};
-
-	pmfalcon_s5a: regulator-pmfalcon-s5a {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s5a";
-		qcom,hpm-min-load = <100000>;
-		regulator-min-microvolt = <1350000>;
-		regulator-max-microvolt = <1350000>;
-	};
-
-	pmfalcon_s6a: regulator-pmfalcon-s6a {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s6a";
-		qcom,hpm-min-load = <100000>;
-		regulator-min-microvolt = <504000>;
-		regulator-max-microvolt = <992000>;
-	};
-
-	pmfalcon_s1b: regulator-pmfalcon-s1b {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s1b";
-		qcom,hpm-min-load = <100000>;
-		regulator-min-microvolt = <1125000>;
-		regulator-max-microvolt = <1125000>;
-	};
-
-	pmfalcon_s2b: regulator-pmfalcon-s2b {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s2b";
-		qcom,hpm-min-load = <100000>;
-		regulator-min-microvolt = <1050000>;
-		regulator-max-microvolt = <1050000>;
-	};
-
-	/* PMFALCON S3 + S4 - VDD_CX supply */
-	pmfalcon_s3b_level: regulator-pmfalcon-s3b-level {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s3b_level";
-		qcom,hpm-min-load = <100000>;
-		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
-		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
-	};
-
-	pmfalcon_s3b_floor_level: regulator-pmfalcon-s3b-floor-level {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s3b_floor_level";
-		qcom,hpm-min-load = <100000>;
-		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
-		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
-	};
-
-	pmfalcon_s3b_level_ao: regulator-pmfalcon-s3b-level-ao {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s3b_level_ao";
-		qcom,hpm-min-load = <100000>;
-		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
-		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
-	};
-
-	/* PMFALCON S5 - VDD_MX supply */
-	pmfalcon_s5b_level: regulator-pmfalcon-s5b-level {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s5b_level";
-		qcom,hpm-min-load = <100000>;
-		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
-		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
-	};
-
-	pmfalcon_s5b_floor_level: regulator-pmfalcon-s5b-floor-level {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s5b_floor_level";
-		qcom,hpm-min-load = <100000>;
-		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
-		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
-	};
-
-	pmfalcon_s5b_level_ao: regulator-pmfalcon-s5b-level-ao {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s5b_level_ao";
-		qcom,hpm-min-load = <100000>;
-		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
-		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
-	};
-
-	pmfalcon_l1a: regulator-pmfalcon-l1a {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l1a";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1150000>;
-		regulator-max-microvolt = <1250000>;
-	};
-
-	pmfalcon_l2a: regulator-pmfalcon-l2a {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l2a";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <950000>;
-		regulator-max-microvolt = <1010000>;
-	};
-
-	pmfalcon_l3a: regulator-pmfalcon-l3a {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l3a";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <950000>;
-		regulator-max-microvolt = <1010000>;
+&rpm_bus {
+	rpm-regulator-smpa4 {
+		status = "okay";
+		pmfalcon_s4: regulator-s4 {
+			regulator-min-microvolt = <1805000>;
+			regulator-max-microvolt = <2040000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-smpa5 {
+		status = "okay";
+		pmfalcon_s5: regulator-s5 {
+			regulator-min-microvolt = <1350000>;
+			regulator-max-microvolt = <1350000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-smpa6 {
+		status = "okay";
+		pmfalcon_s6: regulator-s6 {
+			regulator-min-microvolt = <504000>;
+			regulator-max-microvolt = <992000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-smpb1 {
+		status = "okay";
+		pm2falcon_s1: regulator-s1 {
+			regulator-min-microvolt = <1125000>;
+			regulator-max-microvolt = <1125000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-smpb2 {
+		status = "okay";
+		pm2falcon_s2: regulator-s2 {
+			regulator-min-microvolt = <1050000>;
+			regulator-max-microvolt = <1050000>;
+			status = "okay";
+		};
+	};
+
+	/* PM2FALCON S3 + S4 - VDD_CX supply */
+	rpm-regulator-smpb3 {
+		status = "okay";
+		pm2falcon_s3_level: regulator-s3-level {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_s3_level";
+			qcom,set = <3>;
+			regulator-min-microvolt =
+				<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
+			regulator-max-microvolt =
+				<RPM_SMD_REGULATOR_LEVEL_TURBO>;
+			qcom,use-voltage-level;
+		};
+
+		pm2falcon_s3_floor_level: regulator-s3-floor-level {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_s3_floor_level";
+			qcom,set = <3>;
+			regulator-min-microvolt =
+				<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
+			regulator-max-microvolt =
+				<RPM_SMD_REGULATOR_LEVEL_TURBO>;
+			qcom,use-voltage-floor-level;
+			qcom,always-send-voltage;
+		};
+
+		pm2falcon_s3_level_ao: regulator-s3-level-ao {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_s3_level_ao";
+			qcom,set = <1>;
+			regulator-min-microvolt =
+				<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
+			regulator-max-microvolt =
+				<RPM_SMD_REGULATOR_LEVEL_TURBO>;
+			qcom,use-voltage-level;
+		};
+	};
+
+	/* PM2FALCON S5 - VDD_MX supply */
+	rpm-regulator-smpb5 {
+		status = "okay";
+		pm2falcon_s5_level: regulator-s5-level {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_s5_level";
+			qcom,set = <3>;
+			regulator-min-microvolt =
+				<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
+			regulator-max-microvolt =
+				<RPM_SMD_REGULATOR_LEVEL_TURBO>;
+			qcom,use-voltage-level;
+		};
+
+		pm2falcon_s5_floor_level: regulator-s5-floor-level {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_s5_floor_level";
+			qcom,set = <3>;
+			regulator-min-microvolt =
+				<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
+			regulator-max-microvolt =
+				<RPM_SMD_REGULATOR_LEVEL_TURBO>;
+			qcom,use-voltage-floor-level;
+			qcom,always-send-voltage;
+		};
+
+		pm2falcon_s5_level_ao: regulator-s5-level-ao {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_s5_level_ao";
+			qcom,set = <1>;
+			regulator-min-microvolt =
+				<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
+			regulator-max-microvolt =
+				<RPM_SMD_REGULATOR_LEVEL_TURBO>;
+			qcom,use-voltage-level;
+		};
+	};
+
+	rpm-regulator-ldoa1 {
+		status = "okay";
+		pmfalcon_l1: regulator-l1 {
+			regulator-min-microvolt = <1150000>;
+			regulator-max-microvolt = <1250000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldoa2 {
+		pmfalcon_l2: regulator-l2 {
+			regulator-min-microvolt = <950000>;
+			regulator-max-microvolt = <1010000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldoa3 {
+		pmfalcon_l3: regulator-l3 {
+			regulator-min-microvolt = <950000>;
+			regulator-max-microvolt = <1010000>;
+			status = "okay";
+		};
 	};
 
 	/* TODO: remove if ADRASTEA CX/MX not voted from APPS */
-	pmfalcon_l5a: regulator-pmfalcon-l5a {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l5a";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <525000>;
-		regulator-max-microvolt = <950000>;
+	rpm-regulator-ldoa5 {
+		pmfalcon_l5: regulator-l5 {
+			regulator-min-microvolt = <525000>;
+			regulator-max-microvolt = <950000>;
+			status = "okay";
+		};
 	};
-
-	pmfalcon_l6a: regulator-pmfalcon-l6a {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l6a";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1200000>;
-		regulator-max-microvolt = <1370000>;
+
+	rpm-regulator-ldoa6 {
+		pmfalcon_l6: regulator-l6 {
+			regulator-min-microvolt = <1200000>;
+			regulator-max-microvolt = <1370000>;
+			status = "okay";
+		};
 	};
-
-	pmfalcon_l7a: regulator-pmfalcon-l7a {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l7a";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1200000>;
-		regulator-max-microvolt = <1200000>;
+
+	rpm-regulator-ldoa7 {
+		pmfalcon_l7: regulator-l7 {
+			regulator-min-microvolt = <1200000>;
+			regulator-max-microvolt = <1200000>;
+			status = "okay";
+		};
 	};
-
-	pmfalcon_l8a: regulator-pmfalcon-l8a {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l8a";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1750000>;
-		regulator-max-microvolt = <1900000>;
+
+	rpm-regulator-ldoa8 {
+		pmfalcon_l8: regulator-l8 {
+			regulator-min-microvolt = <1750000>;
+			regulator-max-microvolt = <1900000>;
+			status = "okay";
+		};
 	};
-
-	pmfalcon_l9a: regulator-pmfalcon-l9a {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l9a";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1750000>;
-		regulator-max-microvolt = <1900000>;
+
+	rpm-regulator-ldoa9 {
+		pmfalcon_l9: regulator-l9 {
+			regulator-min-microvolt = <1750000>;
+			regulator-max-microvolt = <1900000>;
+			status = "okay";
+		};
 	};
-
-	pmfalcon_l10a: regulator-pmfalcon-l10a {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l10a";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1780000>;
-		regulator-max-microvolt = <1950000>;
+
+	rpm-regulator-ldoa10 {
+		pmfalcon_l10: regulator-l10 {
+			regulator-min-microvolt = <1780000>;
+			regulator-max-microvolt = <1950000>;
+			status = "okay";
+		};
 	};
-
-	pmfalcon_l11a: regulator-pmfalcon-l11a {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l11a";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1780000>;
-		regulator-max-microvolt = <1950000>;
-	};
-
-	pmfalcon_l12a: regulator-pmfalcon-l12a {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l12a";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1780000>;
-		regulator-max-microvolt = <1950000>;
-	};
-
-	pmfalcon_l13a: regulator-pmfalcon-l13a {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l13a";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1750000>;
-		regulator-max-microvolt = <1950000>;
-	};
-
-	pmfalcon_l14a: regulator-pmfalcon-l14a {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l14a";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1710000>;
-		regulator-max-microvolt = <1900000>;
-	};
-
-	pmfalcon_l15a: regulator-pmfalcon-l15a {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l15a";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1650000>;
-		regulator-max-microvolt = <2950000>;
-	};
-
-	pmfalcon_l17a: regulator-pmfalcon-l17a {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l17a";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1650000>;
-		regulator-max-microvolt = <2950000>;
+
+	rpm-regulator-ldoa11 {
+		pmfalcon_l11: regulator-l11 {
+			regulator-min-microvolt = <1780000>;
+			regulator-max-microvolt = <1950000>;
+			status = "okay";
+		};
 	};
-
-	pmfalcon_l19a: regulator-pmfalcon-l19a {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l19a";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <3200000>;
-		regulator-max-microvolt = <3400000>;
+
+	rpm-regulator-ldoa12 {
+		pmfalcon_l12: regulator-l12 {
+			regulator-min-microvolt = <1780000>;
+			regulator-max-microvolt = <1950000>;
+			status = "okay";
+		};
 	};
-
-	pmfalcon_l1b: regulator-pmfalcon-l1b {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l1b";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <800000>;
-		regulator-max-microvolt = <925000>;
+
+	rpm-regulator-ldoa13 {
+		pmfalcon_l13: regulator-l13 {
+			regulator-min-microvolt = <1780000>;
+			regulator-max-microvolt = <1950000>;
+			status = "okay";
+		};
 	};
-
-	pmfalcon_l2b: regulator-pmfalcon-l2b {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l2b";
-		qcom,hpm-min-load = <5000>;
-		regulator-min-microvolt = <350000>;
-		regulator-max-microvolt = <3100000>;
-	};
-
-	pmfalcon_l3b: regulator-pmfalcon-l3b {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l3b";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1710000>;
-		regulator-max-microvolt = <3600000>;
-	};
-
-	pmfalcon_l4b: regulator-pmfalcon-l4b {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l4b";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1700000>;
-		regulator-max-microvolt = <2950000>;
-	};
-
-	pmfalcon_l5b: regulator-pmfalcon-l5b {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l5b";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1721000>;
-		regulator-max-microvolt = <3600000>;
-	};
-
-	pmfalcon_l6b: regulator-pmfalcon-l6b {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l6b";
-		qcom,hpm-min-load = <5000>;
-		regulator-min-microvolt = <1700000>;
-		regulator-max-microvolt = <3300000>;
-	};
-
-	pmfalcon_l7b: regulator-pmfalcon-l7b {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l7b";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <2700000>;
-		regulator-max-microvolt = <3125000>;
-	};
-
-	pmfalcon_l8b: regulator-pmfalcon-l8b {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l8b";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <3200000>;
-		regulator-max-microvolt = <3400000>;
-	};
-
-	/* PMFALCON L9 = VDD_SSC_CX supply */
-	pmfalcon_l9b_level: regulator-pmfalcon-l9b-level {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l9b_level";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
-		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
-	};
-
-	pmfalcon_l9b_floor_level: regulator-pmfalcon-l9b-floor-level {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l9b_floor_level";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
-		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
-	};
-
-	/* PMFALCON L10 = VDD_SSC_MX supply */
-	pmfalcon_l10b_level: regulator-pmfalcon-l10b-level {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l10b_level";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
-		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
-	};
-
-	pmfalcon_l10b_floor_level: regulator-pmfalcon-l10b-floor-level {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l10b_floor_level";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
-		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
-	};
-
-	pmfalcon_bob: regulator-pmfalcon-bob {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_bob";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
+
+	rpm-regulator-ldoa14 {
+		pmfalcon_l14: regulator-l14 {
+			regulator-min-microvolt = <1710000>;
+			regulator-max-microvolt = <1900000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldoa15 {
+		pmfalcon_l15: regulator-l15 {
+			regulator-min-microvolt = <1650000>;
+			regulator-max-microvolt = <2950000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldoa17 {
+		pmfalcon_l17: regulator-l17 {
+			regulator-min-microvolt = <1650000>;
+			regulator-max-microvolt = <2950000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldoa19 {
+		pmfalcon_l19: regulator-l19 {
+			regulator-min-microvolt = <3200000>;
+			regulator-max-microvolt = <3400000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldob1 {
+		pm2falcon_l1: regulator-l1 {
+			regulator-min-microvolt = <800000>;
+			regulator-max-microvolt = <925000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldob2 {
+		pm2falcon_l2: regulator-l2 {
+			regulator-min-microvolt = <350000>;
+			regulator-max-microvolt = <3100000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldob3 {
+		pm2falcon_l3: regulator-l3 {
+			regulator-min-microvolt = <1710000>;
+			regulator-max-microvolt = <3600000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldob4 {
+		pm2falcon_l4: regulator-l4 {
+			regulator-min-microvolt = <1700000>;
+			regulator-max-microvolt = <2950000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldob5 {
+		pm2falcon_l5: regulator-l5 {
+			regulator-min-microvolt = <1721000>;
+			regulator-max-microvolt = <3600000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldob6 {
+		pm2falcon_l6: regulator-l6 {
+			regulator-min-microvolt = <1700000>;
+			regulator-max-microvolt = <3300000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldob7 {
+		pm2falcon_l7: regulator-l7 {
+			regulator-min-microvolt = <2700000>;
+			regulator-max-microvolt = <3125000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldob8 {
+		pm2falcon_l8: regulator-l8 {
+			regulator-min-microvolt = <3200000>;
+			regulator-max-microvolt = <3400000>;
+			status = "okay";
+		};
+	};
+
+	/* PM2FALCON L9 = VDD_SSC_CX supply */
+	rpm-regulator-ldob9 {
+		status = "okay";
+		pm2falcon_l9_level: regulator-l9-level {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_l9_level";
+			qcom,set = <3>;
+			regulator-min-microvolt =
+				<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
+			regulator-max-microvolt =
+				<RPM_SMD_REGULATOR_LEVEL_TURBO>;
+			qcom,use-voltage-level;
+		};
+
+		pm2falcon_l9_floor_level: regulator-l9-floor-level {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_l9_floor_level";
+			qcom,set = <3>;
+			regulator-min-microvolt =
+				<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
+			regulator-max-microvolt =
+				<RPM_SMD_REGULATOR_LEVEL_TURBO>;
+			qcom,use-voltage-floor-level;
+			qcom,always-send-voltage;
+		};
+	};
+
+	/* PM2FALCON L10 = VDD_SSC_MX supply */
+	rpm-regulator-ldob10 {
+		status = "okay";
+		pm2falcon_l10_level: regulator-l10-level {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_l10_level";
+			qcom,set = <3>;
+			regulator-min-microvolt =
+				<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
+			regulator-max-microvolt =
+				<RPM_SMD_REGULATOR_LEVEL_TURBO>;
+			qcom,use-voltage-level;
+		};
+
+		pm2falcon_l10_floor_level: regulator-l10-floor-level {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_l10_floor_level";
+			qcom,set = <3>;
+			regulator-min-microvolt =
+				<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
+			regulator-max-microvolt =
+				<RPM_SMD_REGULATOR_LEVEL_TURBO>;
+			qcom,use-voltage-floor-level;
+			qcom,always-send-voltage;
+		};
+	};
+
+	rpm-regulator-bobb {
+		status = "okay";
+		pm2falcon_bob: regulator-bob {
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3600000>;
+			status = "okay";
+		};
+
+		pm2falcon_bob_pin1: regulator-bob-pin1 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_bob_pin1";
+			qcom,set = <3>;
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3600000>;
+			qcom,use-pin-ctrl-voltage1;
+		};
+
+		pm2falcon_bob_pin2: regulator-bob-pin2 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_bob_pin2";
+			qcom,set = <3>;
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3600000>;
+			qcom,use-pin-ctrl-voltage2;
+		};
+
+		pm2falcon_bob_pin3: regulator-bob-pin3 {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pm2falcon_bob_pin3";
+			qcom,set = <3>;
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3600000>;
+			qcom,use-pin-ctrl-voltage3;
+		};
 	};
+};
 
+/* Stub regulators */
+/ {
 	/* GFX Supply */
 	gfx_vreg_corner: regulator-gfx-corner {
 		compatible = "qcom,stub-regulator";
diff --git a/arch/arm/boot/dts/qcom/msmfalcon-rumi.dts b/arch/arm/boot/dts/qcom/msmfalcon-rumi.dts
index f0ba8b115120..5d285e7c3b8f 100644
--- a/arch/arm/boot/dts/qcom/msmfalcon-rumi.dts
+++ b/arch/arm/boot/dts/qcom/msmfalcon-rumi.dts
@@ -30,12 +30,12 @@
 
 &sdhc_1 {
 	/* device core power supply */
-	vdd-supply = <&pmfalcon_l4b>;
+	vdd-supply = <&pm2falcon_l4>;
 	qcom,vdd-voltage-level = <2950000 2950000>;
 	qcom,vdd-current-level = <200 570000>;
 
 	/* device communication power supply */
-	vdd-io-supply = <&pmfalcon_l8a>;
+	vdd-io-supply = <&pmfalcon_l8>;
 	qcom,vdd-io-always-on;
 	qcom,vdd-io-lpm-sup;
 	qcom,vdd-io-voltage-level = <1800000 1800000>;
diff --git a/arch/arm/boot/dts/qcom/msmfalcon-sim.dts b/arch/arm/boot/dts/qcom/msmfalcon-sim.dts
index 085419b7e108..a12e48b1c405 100644
--- a/arch/arm/boot/dts/qcom/msmfalcon-sim.dts
+++ b/arch/arm/boot/dts/qcom/msmfalcon-sim.dts
@@ -30,12 +30,12 @@
 
 &sdhc_1 {
 	/* device core power supply */
-	vdd-supply = <&pmfalcon_l4b>;
+	vdd-supply = <&pm2falcon_l4>;
 	qcom,vdd-voltage-level = <2950000 2950000>;
 	qcom,vdd-current-level = <200 570000>;
 
 	/* device communication power supply */
-	vdd-io-supply = <&pmfalcon_l8a>;
+	vdd-io-supply = <&pmfalcon_l8>;
 	qcom,vdd-io-always-on;
 	qcom,vdd-io-lpm-sup;
 	qcom,vdd-io-voltage-level = <1800000 1800000>;
diff --git a/arch/arm/boot/dts/qcom/msmfalcon.dtsi b/arch/arm/boot/dts/qcom/msmfalcon.dtsi
index f2adc32fb732..f76deb8c92a4 100644
--- a/arch/arm/boot/dts/qcom/msmfalcon.dtsi
+++ b/arch/arm/boot/dts/qcom/msmfalcon.dtsi
@@ -696,7 +696,7 @@
 		reg = <0x15700000 0x00100>;
 		interrupts = <0 162 1>;
 
-		vdd_cx-supply = <&pmfalcon_s3b_level>;
+		vdd_cx-supply = <&pm2falcon_s3_level>;
 		qcom,proxy-reg-names = "vdd_cx";
 		qcom,vdd_cx-uV-uA = <RPM_SMD_REGULATOR_LEVEL_TURBO 100000>;
 
@@ -728,7 +728,7 @@
 		reg = <0x1a300000 0x00100>;
 		interrupts = <0 518 1>;
 
-		vdd_cx-supply = <&pmfalcon_s3b_level>;
+		vdd_cx-supply = <&pm2falcon_s3_level>;
 		qcom,proxy-reg-names = "vdd_cx";
 		qcom,vdd_cx-uV-uA = <RPM_SMD_REGULATOR_LEVEL_TURBO 100000>;
 
@@ -783,9 +783,9 @@
 					 "mnoc_axi_clk";
 
 		interrupts = <0 448 1>;
-		vdd_cx-supply = <&pmfalcon_s3b_level>;
+		vdd_cx-supply = <&pm2falcon_s3_level>;
 		vdd_cx-voltage = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
-		vdd_mx-supply = <&pmfalcon_s5b_level>;
+		vdd_mx-supply = <&pm2falcon_s5_level>;
 		vdd_mx-uV = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
 		qcom,firmware-name = "modem";
 		qcom,pil-self-auth;
@@ -811,6 +811,8 @@
 
 #include "msmfalcon-ion.dtsi"
 #include "msmfalcon-bus.dtsi"
+#include "msm-pmfalcon-rpm-regulator.dtsi"
+#include "msm-pm2falcon-rpm-regulator.dtsi"
 #include "msmfalcon-regulator.dtsi"
 #include "msm-gdsc-falcon.dtsi"
 
diff --git a/arch/arm/boot/dts/qcom/msmtriton-regulator.dtsi b/arch/arm/boot/dts/qcom/msmtriton-regulator.dtsi
index a30a65a32d0a..323024278406 100644
--- a/arch/arm/boot/dts/qcom/msmtriton-regulator.dtsi
+++ b/arch/arm/boot/dts/qcom/msmtriton-regulator.dtsi
@@ -14,343 +14,343 @@
 
 / {
 	/* PMFALCON S1 - VDD_APC0 supply */
-	pmfalcon_s1a: regulator-pmfalcon-s1a {
+	pmfalcon_s1: regulator-pmfalcon-s1 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s1a";
+		regulator-name = "pmfalcon_s1";
 		qcom,hpm-min-load = <100000>;
 		regulator-min-microvolt = <565000>;
 		regulator-max-microvolt = <1170000>;
 	};
 
 	/* PMFALCON S2 + S3 = VDD_APC1 supply */
-	pmfalcon_s2a: regulator-pmfalcon-s2a {
+	pmfalcon_s2: regulator-pmfalcon-s2 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s2a";
+		regulator-name = "pmfalcon_s2";
 		qcom,hpm-min-load = <100000>;
 		regulator-min-microvolt = <565000>;
 		regulator-max-microvolt = <1170000>;
 	};
 
-	pmfalcon_s4a: regulator-pmfalcon-s4a {
+	pmfalcon_s4: regulator-pmfalcon-s4 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s4a";
+		regulator-name = "pmfalcon_s4";
 		qcom,hpm-min-load = <100000>;
 		regulator-min-microvolt = <1805000>;
 		regulator-max-microvolt = <2040000>;
 	};
 
-	pmfalcon_s5a: regulator-pmfalcon-s5a {
+	pmfalcon_s5: regulator-pmfalcon-s5 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s5a";
+		regulator-name = "pmfalcon_s5";
 		qcom,hpm-min-load = <100000>;
 		regulator-min-microvolt = <1350000>;
 		regulator-max-microvolt = <1350000>;
 	};
 
-	pmfalcon_s6a: regulator-pmfalcon-s6a {
+	pmfalcon_s6: regulator-pmfalcon-s6 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s6a";
+		regulator-name = "pmfalcon_s6";
 		qcom,hpm-min-load = <100000>;
 		regulator-min-microvolt = <504000>;
 		regulator-max-microvolt = <992000>;
 	};
 
-	pmfalcon_s1b: regulator-pmfalcon-s1b {
+	pm2falcon_s1: regulator-pm2falcon-s1 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s1b";
+		regulator-name = "pm2falcon_s1";
 		qcom,hpm-min-load = <100000>;
 		regulator-min-microvolt = <1125000>;
 		regulator-max-microvolt = <1125000>;
 	};
 
-	pmfalcon_s2b: regulator-pmfalcon-s2b {
+	pm2falcon_s2: regulator-pm2falcon-s2 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s2b";
+		regulator-name = "pm2falcon_s2";
 		qcom,hpm-min-load = <100000>;
 		regulator-min-microvolt = <1050000>;
 		regulator-max-microvolt = <1050000>;
 	};
 
 	/* PMFALCON S3 + S4 - VDD_CX supply */
-	pmfalcon_s3b_level: regulator-pmfalcon-s3b-level {
+	pm2falcon_s3_level: regulator-pm2falcon-s3-level {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s3b_level";
+		regulator-name = "pm2falcon_s3_level";
 		qcom,hpm-min-load = <100000>;
 		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
 		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
 	};
 
-	pmfalcon_s3b_floor_level: regulator-pmfalcon-s3b-floor-level {
+	pm2falcon_s3_floor_level: regulator-pm2falcon-s3-floor-level {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s3b_floor_level";
+		regulator-name = "pm2falcon_s3_floor_level";
 		qcom,hpm-min-load = <100000>;
 		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
 		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
 	};
 
-	pmfalcon_s3b_level_ao: regulator-pmfalcon-s3b-level-ao {
+	pm2falcon_s3_level_ao: regulator-pm2falcon-s3-level-ao {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s3b_level_ao";
+		regulator-name = "pm2falcon_s3_level_ao";
 		qcom,hpm-min-load = <100000>;
 		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
 		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
 	};
 
 	/* PMFALCON S5 - VDD_MX supply */
-	pmfalcon_s5b_level: regulator-pmfalcon-s5b-level {
+	pm2falcon_s5_level: regulator-pm2falcon-s5-level {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s5b_level";
+		regulator-name = "pm2falcon_s5_level";
 		qcom,hpm-min-load = <100000>;
 		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
 		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
 	};
 
-	pmfalcon_s5b_floor_level: regulator-pmfalcon-s5b-floor-level {
+	pm2falcon_s5_floor_level: regulator-pm2falcon-s5-floor-level {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s5b_floor_level";
+		regulator-name = "pm2falcon_s5_floor_level";
 		qcom,hpm-min-load = <100000>;
 		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
 		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
 	};
 
-	pmfalcon_s5b_level_ao: regulator-pmfalcon-s5b-level-ao {
+	pm2falcon_s5_level_ao: regulator-pm2falcon-s5-level-ao {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s5b_level_ao";
+		regulator-name = "pm2falcon_s5_level_ao";
 		qcom,hpm-min-load = <100000>;
 		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
 		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
 	};
 
-	pmfalcon_l1a: regulator-pmfalcon-l1a {
+	pmfalcon_l1: regulator-pmfalcon-l1 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l1a";
+		regulator-name = "pmfalcon_l1";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <1150000>;
 		regulator-max-microvolt = <1250000>;
 	};
 
-	pmfalcon_l2a: regulator-pmfalcon-l2a {
+	pmfalcon_l2: regulator-pmfalcon-l2 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l2a";
+		regulator-name = "pmfalcon_l2";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <950000>;
 		regulator-max-microvolt = <1010000>;
 	};
 
-	pmfalcon_l3a: regulator-pmfalcon-l3a {
+	pmfalcon_l3: regulator-pmfalcon-l3 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l3a";
+		regulator-name = "pmfalcon_l3";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <950000>;
 		regulator-max-microvolt = <1010000>;
 	};
 
 	/* TODO: remove if ADRASTEA CX/MX not voted from APPS */
-	pmfalcon_l5a: regulator-pmfalcon-l5a {
+	pmfalcon_l5: regulator-pmfalcon-l5 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l5a";
+		regulator-name = "pmfalcon_l5";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <525000>;
 		regulator-max-microvolt = <950000>;
 	};
 
-	pmfalcon_l6a: regulator-pmfalcon-l6a {
+	pmfalcon_l6: regulator-pmfalcon-l6 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l6a";
+		regulator-name = "pmfalcon_l6";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <1200000>;
 		regulator-max-microvolt = <1370000>;
 	};
 
-	pmfalcon_l7a: regulator-pmfalcon-l7a {
+	pmfalcon_l7: regulator-pmfalcon-l7 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l7a";
+		regulator-name = "pmfalcon_l7";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <1200000>;
 		regulator-max-microvolt = <1200000>;
 	};
 
-	pmfalcon_l8a: regulator-pmfalcon-l8a {
+	pmfalcon_l8: regulator-pmfalcon-l8 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l8a";
+		regulator-name = "pmfalcon_l8";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <1750000>;
 		regulator-max-microvolt = <1900000>;
 	};
 
-	pmfalcon_l9a: regulator-pmfalcon-l9a {
+	pmfalcon_l9: regulator-pmfalcon-l9 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l9a";
+		regulator-name = "pmfalcon_l9";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <1750000>;
 		regulator-max-microvolt = <1900000>;
 	};
 
-	pmfalcon_l10a: regulator-pmfalcon-l10a {
+	pmfalcon_l10: regulator-pmfalcon-l10 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l10a";
+		regulator-name = "pmfalcon_l10";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <1780000>;
 		regulator-max-microvolt = <1950000>;
 	};
 
-	pmfalcon_l11a: regulator-pmfalcon-l11a {
+	pmfalcon_l11: regulator-pmfalcon-l11 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l11a";
+		regulator-name = "pmfalcon_l11";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <1780000>;
 		regulator-max-microvolt = <1950000>;
 	};
 
-	pmfalcon_l12a: regulator-pmfalcon-l12a {
+	pmfalcon_l12: regulator-pmfalcon-l12 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l12a";
+		regulator-name = "pmfalcon_l12";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <1780000>;
 		regulator-max-microvolt = <1950000>;
 	};
 
-	pmfalcon_l13a: regulator-pmfalcon-l13a {
+	pmfalcon_l13: regulator-pmfalcon-l13 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l13a";
+		regulator-name = "pmfalcon_l13";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <1750000>;
 		regulator-max-microvolt = <1950000>;
 	};
 
-	pmfalcon_l14a: regulator-pmfalcon-l14a {
+	pmfalcon_l14: regulator-pmfalcon-l14 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l14a";
+		regulator-name = "pmfalcon_l14";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <1710000>;
 		regulator-max-microvolt = <1900000>;
 	};
 
-	pmfalcon_l15a: regulator-pmfalcon-l15a {
+	pmfalcon_l15: regulator-pmfalcon-l15 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l15a";
+		regulator-name = "pmfalcon_l15";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <1650000>;
 		regulator-max-microvolt = <2950000>;
 	};
 
-	pmfalcon_l17a: regulator-pmfalcon-l17a {
+	pmfalcon_l17: regulator-pmfalcon-l17 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l17a";
+		regulator-name = "pmfalcon_l17";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <1650000>;
 		regulator-max-microvolt = <2950000>;
 	};
 
-	pmfalcon_l19a: regulator-pmfalcon-l19a {
+	pmfalcon_l19: regulator-pmfalcon-l19 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l19a";
+		regulator-name = "pmfalcon_l19";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <3200000>;
 		regulator-max-microvolt = <3400000>;
 	};
 
-	pmfalcon_l1b: regulator-pmfalcon-l1b {
+	pm2falcon_l1: regulator-pm2falcon-l1 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l1b";
+		regulator-name = "pm2falcon_l1";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <800000>;
 		regulator-max-microvolt = <925000>;
 	};
 
-	pmfalcon_l2b: regulator-pmfalcon-l2b {
+	pm2falcon_l2: regulator-pm2falcon-l2 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l2b";
+		regulator-name = "pm2falcon_l2";
 		qcom,hpm-min-load = <5000>;
 		regulator-min-microvolt = <350000>;
 		regulator-max-microvolt = <3100000>;
 	};
 
-	pmfalcon_l3b: regulator-pmfalcon-l3b {
+	pm2falcon_l3: regulator-pm2falcon-l3 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l3b";
+		regulator-name = "pm2falcon_l3";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <1710000>;
 		regulator-max-microvolt = <3600000>;
 	};
 
-	pmfalcon_l4b: regulator-pmfalcon-l4b {
+	pm2falcon_l4: regulator-pm2falcon-l4 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l4b";
+		regulator-name = "pm2falcon_l4";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <1700000>;
 		regulator-max-microvolt = <2950000>;
 	};
 
-	pmfalcon_l5b: regulator-pmfalcon-l5b {
+	pm2falcon_l5: regulator-pm2falcon-l5 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l5b";
+		regulator-name = "pm2falcon_l5";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <1721000>;
 		regulator-max-microvolt = <3600000>;
 	};
 
-	pmfalcon_l6b: regulator-pmfalcon-l6b {
+	pm2falcon_l6: regulator-pm2falcon-l6 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l6b";
+		regulator-name = "pm2falcon_l6";
 		qcom,hpm-min-load = <5000>;
 		regulator-min-microvolt = <1700000>;
 		regulator-max-microvolt = <3300000>;
 	};
 
-	pmfalcon_l7b: regulator-pmfalcon-l7b {
+	pm2falcon_l7: regulator-pm2falcon-l7 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l7b";
+		regulator-name = "pm2falcon_l7";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <2700000>;
 		regulator-max-microvolt = <3125000>;
 	};
 
-	pmfalcon_l8b: regulator-pmfalcon-l8b {
+	pm2falcon_l8: regulator-pm2falcon-l8 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l8b";
+		regulator-name = "pm2falcon_l8";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <3200000>;
 		regulator-max-microvolt = <3400000>;
 	};
 
 	/* PMFALCON L9 = VDD_SSC_CX supply */
-	pmfalcon_l9b_level: regulator-pmfalcon-l9b-level {
+	pm2falcon_l9_level: regulator-pm2falcon-l9-level {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l9b_level";
+		regulator-name = "pm2falcon_l9_level";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
 		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
 	};
 
-	pmfalcon_l9b_floor_level: regulator-pmfalcon-l9b-floor-level {
+	pm2falcon_l9_floor_level: regulator-pm2falcon-l9-floor-level {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l9b_floor_level";
+		regulator-name = "pm2falcon_l9_floor_level";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
 		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
 	};
 
 	/* PMFALCON L10 = VDD_SSC_MX supply */
-	pmfalcon_l10b_level: regulator-pmfalcon-l10b-level {
+	pm2falcon_l10_level: regulator-pm2falcon-l10-level {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l10b_level";
+		regulator-name = "pm2falcon_l10_level";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
 		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
 	};
 
-	pmfalcon_l10b_floor_level: regulator-pmfalcon-l10b-floor-level {
+	pm2falcon_l10_floor_level: regulator-pm2falcon-l10-floor-level {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l10b_floor_level";
+		regulator-name = "pm2falcon_l10_floor_level";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
 		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
 	};
 
-	pmfalcon_bobb: regulator-pmfalcon-bob {
+	pm2falcon_bob: regulator-pm2falcon-bob {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_bob";
+		regulator-name = "pm2falcon_bob";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
 	};
diff --git a/arch/arm/boot/dts/qcom/msmtriton.dtsi b/arch/arm/boot/dts/qcom/msmtriton.dtsi
index 281b3f51ba11..efae12e53852 100644
--- a/arch/arm/boot/dts/qcom/msmtriton.dtsi
+++ b/arch/arm/boot/dts/qcom/msmtriton.dtsi
@@ -554,7 +554,7 @@
 		reg = <0x15700000 0x00100>;
 		interrupts = <0 162 1>;
 
-		vdd_cx-supply = <&pmfalcon_s3b_level>;
+		vdd_cx-supply = <&pm2falcon_s3_level>;
 		qcom,proxy-reg-names = "vdd_cx";
 		qcom,vdd_cx-uV-uA = <RPM_SMD_REGULATOR_LEVEL_TURBO 100000>;
 
@@ -638,9 +638,9 @@
 					 "mnoc_axi_clk";
 
 		interrupts = <0 448 1>;
-		vdd_cx-supply = <&pmfalcon_s3b_level>;
+		vdd_cx-supply = <&pm2falcon_s3_level>;
 		vdd_cx-voltage = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
-		vdd_mx-supply = <&pmfalcon_s5b_level>;
+		vdd_mx-supply = <&pm2falcon_s5_level>;
 		vdd_mx-uV = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
 		qcom,firmware-name = "modem";
 		qcom,pil-self-auth;