Merge "ARM: dts: msm: Move to RPM based regulators for msmtriton"

2 files changed, 496 insertions, 339 deletions

diff --git a/arch/arm/boot/dts/qcom/msmtriton-regulator.dtsi b/arch/arm/boot/dts/qcom/msmtriton-regulator.dtsi
index 323024278406..2201a04cfbc1 100644
--- a/arch/arm/boot/dts/qcom/msmtriton-regulator.dtsi
+++ b/arch/arm/boot/dts/qcom/msmtriton-regulator.dtsi
@@ -10,351 +10,483 @@
  * GNU General Public License for more details.
  */
 
-/* Stub regulators */
-
-/ {
-	/* PMFALCON S1 - VDD_APC0 supply */
-	pmfalcon_s1: regulator-pmfalcon-s1 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s1";
-		qcom,hpm-min-load = <100000>;
-		regulator-min-microvolt = <565000>;
-		regulator-max-microvolt = <1170000>;
-	};
-
-	/* PMFALCON S2 + S3 = VDD_APC1 supply */
-	pmfalcon_s2: regulator-pmfalcon-s2 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s2";
-		qcom,hpm-min-load = <100000>;
-		regulator-min-microvolt = <565000>;
-		regulator-max-microvolt = <1170000>;
-	};
-
-	pmfalcon_s4: regulator-pmfalcon-s4 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s4";
-		qcom,hpm-min-load = <100000>;
-		regulator-min-microvolt = <1805000>;
-		regulator-max-microvolt = <2040000>;
-	};
-
-	pmfalcon_s5: regulator-pmfalcon-s5 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s5";
-		qcom,hpm-min-load = <100000>;
-		regulator-min-microvolt = <1350000>;
-		regulator-max-microvolt = <1350000>;
-	};
-
-	pmfalcon_s6: regulator-pmfalcon-s6 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_s6";
-		qcom,hpm-min-load = <100000>;
-		regulator-min-microvolt = <504000>;
-		regulator-max-microvolt = <992000>;
-	};
-
-	pm2falcon_s1: regulator-pm2falcon-s1 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pm2falcon_s1";
-		qcom,hpm-min-load = <100000>;
-		regulator-min-microvolt = <1125000>;
-		regulator-max-microvolt = <1125000>;
-	};
-
-	pm2falcon_s2: regulator-pm2falcon-s2 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pm2falcon_s2";
-		qcom,hpm-min-load = <100000>;
-		regulator-min-microvolt = <1050000>;
-		regulator-max-microvolt = <1050000>;
-	};
-
-	/* PMFALCON S3 + S4 - VDD_CX supply */
-	pm2falcon_s3_level: regulator-pm2falcon-s3-level {
-		compatible = "qcom,stub-regulator";
-		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>;
-	};
-
-	pm2falcon_s3_floor_level: regulator-pm2falcon-s3-floor-level {
-		compatible = "qcom,stub-regulator";
-		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>;
-	};
-
-	pm2falcon_s3_level_ao: regulator-pm2falcon-s3-level-ao {
-		compatible = "qcom,stub-regulator";
-		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 */
-	pm2falcon_s5_level: regulator-pm2falcon-s5-level {
-		compatible = "qcom,stub-regulator";
-		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>;
-	};
-
-	pm2falcon_s5_floor_level: regulator-pm2falcon-s5-floor-level {
-		compatible = "qcom,stub-regulator";
-		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>;
-	};
-
-	pm2falcon_s5_level_ao: regulator-pm2falcon-s5-level-ao {
-		compatible = "qcom,stub-regulator";
-		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_l1: regulator-pmfalcon-l1 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l1";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1150000>;
-		regulator-max-microvolt = <1250000>;
-	};
-
-	pmfalcon_l2: regulator-pmfalcon-l2 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l2";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <950000>;
-		regulator-max-microvolt = <1010000>;
-	};
-
-	pmfalcon_l3: regulator-pmfalcon-l3 {
-		compatible = "qcom,stub-regulator";
-		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_l5: regulator-pmfalcon-l5 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l5";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <525000>;
-		regulator-max-microvolt = <950000>;
-	};
-
-	pmfalcon_l6: regulator-pmfalcon-l6 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l6";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1200000>;
-		regulator-max-microvolt = <1370000>;
-	};
-
-	pmfalcon_l7: regulator-pmfalcon-l7 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l7";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1200000>;
-		regulator-max-microvolt = <1200000>;
-	};
-
-	pmfalcon_l8: regulator-pmfalcon-l8 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l8";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1750000>;
-		regulator-max-microvolt = <1900000>;
-	};
-
-	pmfalcon_l9: regulator-pmfalcon-l9 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l9";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1750000>;
-		regulator-max-microvolt = <1900000>;
-	};
-
-	pmfalcon_l10: regulator-pmfalcon-l10 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l10";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1780000>;
-		regulator-max-microvolt = <1950000>;
-	};
-
-	pmfalcon_l11: regulator-pmfalcon-l11 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l11";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1780000>;
-		regulator-max-microvolt = <1950000>;
-	};
-
-	pmfalcon_l12: regulator-pmfalcon-l12 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l12";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1780000>;
-		regulator-max-microvolt = <1950000>;
-	};
-
-	pmfalcon_l13: regulator-pmfalcon-l13 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l13";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1750000>;
-		regulator-max-microvolt = <1950000>;
-	};
-
-	pmfalcon_l14: regulator-pmfalcon-l14 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l14";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1710000>;
-		regulator-max-microvolt = <1900000>;
-	};
-
-	pmfalcon_l15: regulator-pmfalcon-l15 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l15";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1650000>;
-		regulator-max-microvolt = <2950000>;
-	};
-
-	pmfalcon_l17: regulator-pmfalcon-l17 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l17";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1650000>;
-		regulator-max-microvolt = <2950000>;
-	};
-
-	pmfalcon_l19: regulator-pmfalcon-l19 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pmfalcon_l19";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <3200000>;
-		regulator-max-microvolt = <3400000>;
-	};
-
-	pm2falcon_l1: regulator-pm2falcon-l1 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pm2falcon_l1";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <800000>;
-		regulator-max-microvolt = <925000>;
-	};
-
-	pm2falcon_l2: regulator-pm2falcon-l2 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pm2falcon_l2";
-		qcom,hpm-min-load = <5000>;
-		regulator-min-microvolt = <350000>;
-		regulator-max-microvolt = <3100000>;
-	};
-
-	pm2falcon_l3: regulator-pm2falcon-l3 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pm2falcon_l3";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1710000>;
-		regulator-max-microvolt = <3600000>;
-	};
-
-	pm2falcon_l4: regulator-pm2falcon-l4 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pm2falcon_l4";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1700000>;
-		regulator-max-microvolt = <2950000>;
-	};
-
-	pm2falcon_l5: regulator-pm2falcon-l5 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pm2falcon_l5";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1721000>;
-		regulator-max-microvolt = <3600000>;
-	};
-
-	pm2falcon_l6: regulator-pm2falcon-l6 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pm2falcon_l6";
-		qcom,hpm-min-load = <5000>;
-		regulator-min-microvolt = <1700000>;
-		regulator-max-microvolt = <3300000>;
-	};
-
-	pm2falcon_l7: regulator-pm2falcon-l7 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pm2falcon_l7";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <2700000>;
-		regulator-max-microvolt = <3125000>;
-	};
-
-	pm2falcon_l8: regulator-pm2falcon-l8 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pm2falcon_l8";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <3200000>;
-		regulator-max-microvolt = <3400000>;
-	};
-
-	/* PMFALCON L9 = VDD_SSC_CX supply */
-	pm2falcon_l9_level: regulator-pm2falcon-l9-level {
-		compatible = "qcom,stub-regulator";
-		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>;
-	};
-
-	pm2falcon_l9_floor_level: regulator-pm2falcon-l9-floor-level {
-		compatible = "qcom,stub-regulator";
-		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 */
-	pm2falcon_l10_level: regulator-pm2falcon-l10-level {
-		compatible = "qcom,stub-regulator";
-		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>;
+&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 {
+		status = "okay";
+		pmfalcon_l2: regulator-l2 {
+			regulator-min-microvolt = <950000>;
+			regulator-max-microvolt = <1010000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldoa3 {
+		status = "okay";
+		pmfalcon_l3: regulator-l3 {
+			regulator-min-microvolt = <950000>;
+			regulator-max-microvolt = <1010000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldoa5 {
+		status = "okay";
+		pmfalcon_l5: regulator-l5 {
+			regulator-min-microvolt = <525000>;
+			regulator-max-microvolt = <950000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldoa6 {
+		status = "okay";
+		pmfalcon_l6: regulator-l6 {
+			regulator-min-microvolt = <1200000>;
+			regulator-max-microvolt = <1370000>;
+			status = "okay";
+		};
+
+		pmfalcon_l6_pin_ctrl: regulator-l6-pin-ctrl {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pmfalcon_l6_pin_ctrl";
+			qcom,set = <3>;
+			regulator-min-microvolt = <1200000>;
+			regulator-max-microvolt = <1370000>;
+			/* Force NPM follows HW_EN1 */
+			qcom,init-pin-ctrl-mode = <2>;
+			/* Enable follows HW_EN1 */
+			qcom,enable-with-pin-ctrl = <0 2>;
+		};
+	};
+
+	rpm-regulator-ldoa7 {
+		status = "okay";
+		pmfalcon_l7: regulator-l7 {
+			regulator-min-microvolt = <1200000>;
+			regulator-max-microvolt = <1200000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldoa8 {
+		status = "okay";
+		pmfalcon_l8: regulator-l8 {
+			regulator-min-microvolt = <1750000>;
+			regulator-max-microvolt = <1900000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldoa9 {
+		status = "okay";
+		pmfalcon_l9: regulator-l9 {
+			regulator-min-microvolt = <1750000>;
+			regulator-max-microvolt = <1900000>;
+			status = "okay";
+		};
+
+		pmfalcon_l9_pin_ctrl: regulator-l9-pin-ctrl {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pmfalcon_l9_pin_ctrl";
+			qcom,set = <3>;
+			regulator-min-microvolt = <1750000>;
+			regulator-max-microvolt = <1900000>;
+			/* Force NPM follows HW_EN1 */
+			qcom,init-pin-ctrl-mode = <2>;
+			/* Enable follows HW_EN1 */
+			qcom,enable-with-pin-ctrl = <0 2>;
+		};
+	};
+
+	rpm-regulator-ldoa10 {
+		status = "okay";
+		pmfalcon_l10: regulator-l10 {
+			regulator-min-microvolt = <1780000>;
+			regulator-max-microvolt = <1950000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldoa11 {
+		status = "okay";
+		pmfalcon_l11: regulator-l11 {
+			regulator-min-microvolt = <1780000>;
+			regulator-max-microvolt = <1950000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldoa12 {
+		status = "okay";
+		pmfalcon_l12: regulator-l12 {
+			regulator-min-microvolt = <1780000>;
+			regulator-max-microvolt = <1950000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldoa13 {
+		status = "okay";
+		pmfalcon_l13: regulator-l13 {
+			regulator-min-microvolt = <1780000>;
+			regulator-max-microvolt = <1950000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldoa14 {
+		status = "okay";
+		pmfalcon_l14: regulator-l14 {
+			regulator-min-microvolt = <1710000>;
+			regulator-max-microvolt = <1900000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldoa15 {
+		status = "okay";
+		pmfalcon_l15: regulator-l15 {
+			regulator-min-microvolt = <1650000>;
+			regulator-max-microvolt = <2950000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldoa17 {
+		status = "okay";
+		pmfalcon_l17: regulator-l17 {
+			regulator-min-microvolt = <1650000>;
+			regulator-max-microvolt = <2950000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldoa19 {
+		status = "okay";
+		pmfalcon_l19: regulator-l19 {
+			regulator-min-microvolt = <3200000>;
+			regulator-max-microvolt = <3400000>;
+			status = "okay";
+		};
+
+		pmfalcon_l19_pin_ctrl: regulator-l19-pin-ctrl {
+			compatible = "qcom,rpm-smd-regulator";
+			regulator-name = "pmfalcon_l19_pin_ctrl";
+			qcom,set = <3>;
+			regulator-min-microvolt = <3200000>;
+			regulator-max-microvolt = <3400000>;
+			/* Force NPM follows HW_EN1 */
+			qcom,init-pin-ctrl-mode = <2>;
+			/* Enable follows HW_EN1 */
+			qcom,enable-with-pin-ctrl = <0 2>;
+		};
+	};
+
+	rpm-regulator-ldob1 {
+		status = "okay";
+		pm2falcon_l1: regulator-l1 {
+			regulator-min-microvolt = <800000>;
+			regulator-max-microvolt = <925000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldob2 {
+		status = "okay";
+		pm2falcon_l2: regulator-l2 {
+			regulator-min-microvolt = <350000>;
+			regulator-max-microvolt = <3100000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldob3 {
+		status = "okay";
+		pm2falcon_l3: regulator-l3 {
+			regulator-min-microvolt = <1710000>;
+			regulator-max-microvolt = <3600000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldob4 {
+		status = "okay";
+		pm2falcon_l4: regulator-l4 {
+			regulator-min-microvolt = <1700000>;
+			regulator-max-microvolt = <2950000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldob5 {
+		status = "okay";
+		pm2falcon_l5: regulator-l5 {
+			regulator-min-microvolt = <1721000>;
+			regulator-max-microvolt = <3600000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldob6 {
+		status = "okay";
+		pm2falcon_l6: regulator-l6 {
+			regulator-min-microvolt = <1700000>;
+			regulator-max-microvolt = <3300000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldob7 {
+		status = "okay";
+		pm2falcon_l7: regulator-l7 {
+			regulator-min-microvolt = <2700000>;
+			regulator-max-microvolt = <3125000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldob8 {
+		status = "okay";
+		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;
+		};
 	};
+};
 
-	pm2falcon_l10_floor_level: regulator-pm2falcon-l10-floor-level {
-		compatible = "qcom,stub-regulator";
-		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_charger {
+	smb2_vbus: qcom,smb2-vbus {
+		regulator-name = "smb2-vbus";
 	};
 
-	pm2falcon_bob: regulator-pm2falcon-bob {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pm2falcon_bob";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
+	smb2_vconn: qcom,smb2-vconn {
+		regulator-name = "smb2-vconn";
 	};
+};
 
+/* Stub regulators */
+/ {
 	/* GFX Supply */
 	gfx_vreg_corner: regulator-gfx-corner {
 		compatible = "qcom,stub-regulator";
diff --git a/arch/arm/boot/dts/qcom/msmtriton.dtsi b/arch/arm/boot/dts/qcom/msmtriton.dtsi
index 5bb76d5d962c..e577a5692d90 100644
--- a/arch/arm/boot/dts/qcom/msmtriton.dtsi
+++ b/arch/arm/boot/dts/qcom/msmtriton.dtsi
@@ -1007,9 +1007,34 @@
 		qcom,config-arr = <0x178880b8  0x178980b8
 				   0x178a80b8  0x178b80b8>;
 	};
+
+	spmi_bus: qcom,spmi@800f000 {
+		compatible = "qcom,spmi-pmic-arb";
+		reg = <0x800f000 0x1000>,
+			<0x8400000 0x1000000>,
+			<0x9400000 0x1000000>,
+			<0xa400000 0x220000>,
+			<0x800a000 0x3000>;
+		reg-names = "core", "chnls", "obsrvr", "intr", "cnfg";
+		interrupt-names = "periph_irq";
+		interrupts = <GIC_SPI 326 IRQ_TYPE_NONE>;
+		qcom,ee = <0>;
+		qcom,channel = <0>;
+		#address-cells = <2>;
+		#size-cells = <0>;
+		interrupt-controller;
+		#interrupt-cells = <4>;
+		cell-index = <0>;
+		qcom,not-wakeup; /* Needed until Full-boot-chain enabled */
+		status = "ok";
+	};
 };
 
 #include "msmtriton-ion.dtsi"
+#include "msm-pmfalcon.dtsi"
+#include "msm-pm2falcon.dtsi"
+#include "msm-pmfalcon-rpm-regulator.dtsi"
+#include "msm-pm2falcon-rpm-regulator.dtsi"
 #include "msmtriton-regulator.dtsi"
 #include "msm-gdsc-falcon.dtsi"
 #include "msmfalcon-common.dtsi"