diff --git a/qcom/tuna-mtp-kiwi.dtsi b/qcom/tuna-mtp-kiwi.dtsi
index 3b78f90d..ac5fccfa 100644
--- a/qcom/tuna-mtp-kiwi.dtsi
+++ b/qcom/tuna-mtp-kiwi.dtsi
@@ -5,8 +5,10 @@
 
 #include "tuna-mtp.dtsi"
 
-&S1G_ALT {
-	status = "ok";
+&S1G {
+	regulator-min-microvolt = <806000>;
+	regulator-max-microvolt = <1003000>;
+	qcom,init-voltage = <852000>;
 };
 
 &L3G {
diff --git a/qcom/tuna-rcm-kiwi.dtsi b/qcom/tuna-rcm-kiwi.dtsi
index eb5ff5d3..c41e8af8 100644
--- a/qcom/tuna-rcm-kiwi.dtsi
+++ b/qcom/tuna-rcm-kiwi.dtsi
@@ -4,3 +4,13 @@
  */
 
 #include "tuna-cdp.dtsi"
+
+&S1G {
+	regulator-min-microvolt = <806000>;
+	regulator-max-microvolt = <1003000>;
+	qcom,init-voltage = <852000>;
+};
+
+&L3G {
+	regulator-always-on;
+};
diff --git a/qcom/tuna-regulators.dtsi b/qcom/tuna-regulators.dtsi
index 0fca820e..0b472355 100644
--- a/qcom/tuna-regulators.dtsi
+++ b/qcom/tuna-regulators.dtsi
@@ -149,6 +149,7 @@
 			<RPMH_REGULATOR_MODE_LPM
 			 RPMH_REGULATOR_MODE_HPM>;
 		qcom,mode-threshold-currents = <0 30000>;
+		status = "disabled";
 
 		L6B: pmxr2230_l6: vreg-pmxr2230-l6 {
 			regulator-name = "pmxr2230_l6";
@@ -157,6 +158,7 @@
 			regulator-max-microvolt = <1370000>;
 			qcom,init-voltage = <1256000>;
 			qcom,init-mode = <RPMH_REGULATOR_MODE_HPM>;
+			status = "disabled";
 		};
 	};
 
@@ -301,6 +303,7 @@
 			<RPMH_REGULATOR_MODE_LPM
 			 RPMH_REGULATOR_MODE_HPM>;
 		qcom,mode-threshold-currents = <0 10000>;
+		status = "disabled";
 
 		L14B: pmxr2230_l14: vreg-pmxr2230-l14 {
 			regulator-name = "pmxr2230_l14";
@@ -309,6 +312,7 @@
 			regulator-max-microvolt = <3544000>;
 			qcom,init-voltage = <2800000>;
 			qcom,init-mode = <RPMH_REGULATOR_MODE_HPM>;
+			status = "disabled";
 		};
 	};
 
@@ -867,19 +871,6 @@
 		};
 	};
 
-	rpmh-regulator-smpg1 {
-		compatible = "qcom,rpmh-vrm-regulator";
-		qcom,resource-name = "smpg1";
-
-		S1G: pm_v6g_s1: vreg-pm_v6g-s1 {
-			regulator-name = "pm_v6g_s1";
-			qcom,set = <RPMH_REGULATOR_SET_ALL>;
-			regulator-min-microvolt = <2156000>;
-			regulator-max-microvolt = <2400000>;
-			qcom,init-voltage = <2200000>;
-		};
-	};
-
 	rpmh-regulator-smpg2 {
 		compatible = "qcom,rpmh-vrm-regulator";
 		qcom,resource-name = "smpg2";
@@ -910,17 +901,16 @@
 		};
 	};
 
-	rpmh-regulator-smpg1_alt {
+	rpmh-regulator-smpg1 {
 		compatible = "qcom,rpmh-vrm-regulator";
-		qcom,resource-name = "smpg1_alt";
+		qcom,resource-name = "smpg1";
 
-		S1G_ALT: pm_v6g_s1_alt: vreg-pm_v6g-s1_alt {
-			regulator-name = "pm_v6g_s1_alt";
+		S1G: pm_v6g_s1: vreg-pm_v6g-s1 {
+			regulator-name = "pm_v6g_s1";
 			qcom,set = <RPMH_REGULATOR_SET_ALL>;
-			regulator-min-microvolt = <806000>;
-			regulator-max-microvolt = <1003000>;
-			qcom,init-voltage = <852000>;
-			status = "disabled";
+			regulator-min-microvolt = <2156000>;
+			regulator-max-microvolt = <2400000>;
+			qcom,init-voltage = <2200000>;
 		};
 	};
 
@@ -1210,6 +1200,7 @@
 	rpmh-regulator-ldom5 {
 		compatible = "qcom,rpmh-vrm-regulator";
 		qcom,resource-name = "ldom5";
+		status = "disabled";
 
 		L5M:
 		pm8010m_l5: vreg-pm8010m-l5 {
@@ -1218,6 +1209,7 @@
 			regulator-min-microvolt = <1200000>;
 			regulator-max-microvolt = <1200000>;
 			qcom,init-voltage = <1200000>;
+			status = "disabled";
 		};
 	};
 
@@ -1303,6 +1295,7 @@
 	rpmh-regulator-ldon4 {
 		compatible = "qcom,rpmh-vrm-regulator";
 		qcom,resource-name = "ldon4";
+		status = "disabled";
 
 		L4N: pm8010n_l4: vreg-pm8010n-l4 {
 			regulator-name = "pm8010n_l4";
@@ -1310,6 +1303,7 @@
 			regulator-min-microvolt = <1792000>;
 			regulator-max-microvolt = <3312000>;
 			qcom,init-voltage = <1800000>;
+			status = "disabled";
 		};
 	};