diff --git a/arch/arm/boot/dts/qcom/apq8096-v3-auto-cdp.dts b/arch/arm/boot/dts/qcom/apq8096-v3-auto-cdp.dts
index 5f81ec25ca46..e25a1f482e1b 100644
--- a/arch/arm/boot/dts/qcom/apq8096-v3-auto-cdp.dts
+++ b/arch/arm/boot/dts/qcom/apq8096-v3-auto-cdp.dts
@@ -15,6 +15,7 @@
 #include "apq8096-v3.dtsi"
 #include "msm8996-pm8994.dtsi"
 #include "msm8996-auto-cdp.dtsi"
+#include "msm8996v3-auto.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. APQ 8096 v3 AUTO CDP";
diff --git a/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dts b/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dts
index c4070f61ad47..d937ce278aa2 100644
--- a/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dts
+++ b/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dts
@@ -15,6 +15,7 @@
 #include "apq8096pro.dtsi"
 #include "msm8996-pm8994.dtsi"
 #include "msm8996-auto-cdp.dtsi"
+#include "msm8996pro-auto.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. APQ 8096 pro AUTO CDP";
@@ -34,22 +35,3 @@
 	};
 };
 
-&gfx_vreg {
-	qcom,cpr-voltage-ceiling =
-		/* Speed bin 0 */
-		<600000  670000  670000  750000  830000  910000  960000 1020000
-		1070000>,
-
-		/* Speed bin 1 */
-		<600000  670000  670000  750000  830000  910000  960000 1020000
-		1070000>;
-
-	qcom,cpr-voltage-floor =
-		/* Speed bin 0 */
-		<600000  600000  600000  600000  600000  600000  600000  600000
-		 600000>,
-
-		/* Speed bin 1 */
-		<600000  600000  600000  600000  600000  600000  600000  600000
-		 600000>;
-};
diff --git a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-cdp.dts b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-cdp.dts
index 323a23a3892b..2c54dfe19e18 100644
--- a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-cdp.dts
+++ b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-cdp.dts
@@ -15,6 +15,7 @@
 #include "apq8096pro-v1.1.dtsi"
 #include "msm8996-pm8994.dtsi"
 #include "msm8996-auto-cdp.dtsi"
+#include "msm8996pro-auto.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. APQ 8096 pro v1.1 AUTO CDP";
@@ -34,22 +35,3 @@
 	};
 };
 
-&gfx_vreg {
-	qcom,cpr-voltage-ceiling =
-		/* Speed bin 0 */
-		<600000  670000  670000  750000  830000  910000  960000 1020000
-		1070000>,
-
-		/* Speed bin 1 */
-		<600000  670000  670000  750000  830000  910000  960000 1020000
-		1070000>;
-
-	qcom,cpr-voltage-floor =
-		/* Speed bin 0 */
-		<600000  600000  600000  600000  600000  600000  600000  600000
-		 600000>,
-
-		/* Speed bin 1 */
-		<600000  600000  600000  600000  600000  600000  600000  600000
-		 600000>;
-};
diff --git a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
index 34e41c2bf28f..dbc4149672bf 100644
--- a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
@@ -966,87 +966,4 @@
 	/delete-property/ qcom,spkr-sd-n-gpio;
 };
 
-&hl7509_en_vreg {
-	status = "ok";
-};
 
-&hl7509_vreg {
-	status = "ok";
-};
-
-&gfx_cpr {
-	vdd-supply = <&hl7509_vreg>;
-	qcom,cpr-step-quot-init-min = <20>;
-	qcom,cpr-step-quot-init-max = <26>;
-	qcom,voltage-step = <10000>;
-	/delete-property/ qcom,cpr-enable;
-};
-
-&gfx_vreg {
-	qcom,cpr-voltage-ceiling =
-		<600000  670000  670000  750000  830000
-		 910000  960000 1020000>;
-	qcom,cpr-voltage-floor =
-		<600000  600000  600000  600000  600000
-		 600000  600000  600000>;
-};
-
-&pm8994_l3 {
-	regulator-min-microvolt = <875000>;
-	regulator-max-microvolt = <875000>;
-	qcom,init-voltage = <875000>;
-};
-
-&pm8994_l11 {
-	regulator-min-microvolt = <850000>;
-	regulator-max-microvolt = <850000>;
-	qcom,init-voltage = <850000>;
-};
-
-&pm8994_l17 {
-	regulator-min-microvolt = <1800000>;
-	regulator-max-microvolt = <1800000>;
-	qcom,init-voltage = <1800000>;
-};
-
-&pm8994_l23 {
-	regulator-min-microvolt = <1100000>;
-	regulator-max-microvolt = <1100000>;
-	qcom,init-voltage = <1100000>;
-};
-
-&pm8994_l27 {
-	regulator-min-microvolt = <800000>;
-	regulator-max-microvolt = <800000>;
-	qcom,init-voltage = <800000>;
-};
-
-&pm8994_l29 {
-	regulator-min-microvolt = <2500000>;
-	regulator-max-microvolt = <2500000>;
-	qcom,init-voltage = <2500000>;
-};
-
-&rpm_bus {
-	rpm-regulator-ldoa26 {
-		/delete-node/ pm8994_l26_corner;
-		/delete-node/ pm8994_l26_floor_corner;
-
-		pm8994_l26: regulator-l26 {
-			regulator-min-microvolt = <1100000>;
-			regulator-max-microvolt = <1100000>;
-			qcom,init-voltage = <1100000>;
-			status = "okay";
-		};
-	};
-
-	rpm-regulator-ldoa31 {
-		status = "okay";
-		pm8994_l31: regulator-l31 {
-			regulator-min-microvolt = <1100000>;
-			regulator-max-microvolt = <1100000>;
-			qcom,init-voltage = <1100000>;
-			status = "okay";
-		};
-	};
-};
diff --git a/arch/arm/boot/dts/qcom/msm8996-v3-auto-adp.dts b/arch/arm/boot/dts/qcom/msm8996-v3-auto-adp.dts
index 1a93c692c58c..56b6b1c9e12d 100644
--- a/arch/arm/boot/dts/qcom/msm8996-v3-auto-adp.dts
+++ b/arch/arm/boot/dts/qcom/msm8996-v3-auto-adp.dts
@@ -16,6 +16,7 @@
 #include "msm8996-v3.dtsi"
 #include "msm8996-pm8994.dtsi"
 #include "msm8996-agave-adp.dtsi"
+#include "msm8996v3-auto.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. MSM 8996 v3 AUTO ADP";
@@ -61,14 +62,6 @@
 	};
 };
 
-&hl7509_en_vreg {
-	status = "ok";
-};
-
-&hl7509_vreg {
-	status = "ok";
-};
-
 &sdhc_2 {
 	cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
 	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on_sbc>;
@@ -82,79 +75,3 @@
 	};
 };
 
-&gfx_cpr {
-	vdd-supply = <&hl7509_vreg>;
-	qcom,cpr-step-quot-init-min = <20>;
-	qcom,cpr-step-quot-init-max = <26>;
-	qcom,voltage-step = <10000>;
-	/delete-property/ qcom,cpr-enable;
-};
-
-&gfx_vreg {
-	qcom,cpr-voltage-ceiling =
-		<600000  670000  670000  750000  830000
-		 910000  960000 1020000>;
-	qcom,cpr-voltage-floor =
-		<600000  600000  600000  600000  600000
-		 600000  600000  600000>;
-};
-
-&pm8994_l3 {
-	regulator-min-microvolt = <875000>;
-	regulator-max-microvolt = <875000>;
-	qcom,init-voltage = <875000>;
-};
-
-&pm8994_l11 {
-	regulator-min-microvolt = <850000>;
-	regulator-max-microvolt = <850000>;
-	qcom,init-voltage = <850000>;
-};
-
-&pm8994_l17 {
-	regulator-min-microvolt = <1800000>;
-	regulator-max-microvolt = <1800000>;
-	qcom,init-voltage = <1800000>;
-};
-
-&pm8994_l23 {
-	regulator-min-microvolt = <1100000>;
-	regulator-max-microvolt = <1100000>;
-	qcom,init-voltage = <1100000>;
-};
-
-&pm8994_l27 {
-	regulator-min-microvolt = <800000>;
-	regulator-max-microvolt = <800000>;
-	qcom,init-voltage = <800000>;
-};
-
-&pm8994_l29 {
-	regulator-min-microvolt = <2500000>;
-	regulator-max-microvolt = <2500000>;
-	qcom,init-voltage = <2500000>;
-};
-
-&rpm_bus {
-	rpm-regulator-ldoa26 {
-		/delete-node/ pm8994_l26_corner;
-		/delete-node/ pm8994_l26_floor_corner;
-
-		pm8994_l26: regulator-l26 {
-			regulator-min-microvolt = <1100000>;
-			regulator-max-microvolt = <1100000>;
-			qcom,init-voltage = <1100000>;
-			status = "okay";
-		};
-	};
-
-	rpm-regulator-ldoa31 {
-		status = "okay";
-		pm8994_l31: regulator-l31 {
-			regulator-min-microvolt = <1100000>;
-			regulator-max-microvolt = <1100000>;
-			qcom,init-voltage = <1100000>;
-			status = "okay";
-		};
-	};
-};
diff --git a/arch/arm/boot/dts/qcom/msm8996-v3-auto-cdp.dts b/arch/arm/boot/dts/qcom/msm8996-v3-auto-cdp.dts
index 04625b9e0b7e..f64ae0e70457 100644
--- a/arch/arm/boot/dts/qcom/msm8996-v3-auto-cdp.dts
+++ b/arch/arm/boot/dts/qcom/msm8996-v3-auto-cdp.dts
@@ -15,6 +15,7 @@
 #include "msm8996-v3.dtsi"
 #include "msm8996-pm8994.dtsi"
 #include "msm8996-auto-cdp.dtsi"
+#include "msm8996v3-auto.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. MSM 8996 v3 AUTO CDP";
diff --git a/arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts b/arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts
index 926ac5e6de44..f280c2eaf80a 100644
--- a/arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts
+++ b/arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts
@@ -16,6 +16,7 @@
 #include "msm8996pro.dtsi"
 #include "msm8996-pm8994.dtsi"
 #include "msm8996-agave-adp.dtsi"
+#include "msm8996pro-auto.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. MSM 8996pro AUTO ADP";
@@ -61,14 +62,6 @@
 	};
 };
 
-&hl7509_en_vreg {
-	status = "ok";
-};
-
-&hl7509_vreg {
-	status = "ok";
-};
-
 &sdhc_2 {
 	cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
 	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on_sbc>;
@@ -82,99 +75,3 @@
 	};
 };
 
-&gfx_cpr {
-	vdd-supply = <&hl7509_vreg>;
-	qcom,cpr-step-quot-init-min = <20>;
-	qcom,cpr-step-quot-init-max = <26>;
-	qcom,voltage-step = <10000>;
-	/delete-property/ qcom,cpr-enable;
-};
-
-&gfx_vreg {
-	qcom,cpr-voltage-ceiling =
-		<600000  670000  670000  750000  830000
-		 910000  960000 1020000>;
-	qcom,cpr-voltage-floor =
-		<600000  600000  600000  600000  600000
-		 600000  600000  600000>;
-};
-
-&pm8994_l3 {
-	regulator-min-microvolt = <875000>;
-	regulator-max-microvolt = <875000>;
-	qcom,init-voltage = <875000>;
-};
-
-&pm8994_l11 {
-	regulator-min-microvolt = <850000>;
-	regulator-max-microvolt = <850000>;
-	qcom,init-voltage = <850000>;
-};
-
-&pm8994_l17 {
-	regulator-min-microvolt = <1800000>;
-	regulator-max-microvolt = <1800000>;
-	qcom,init-voltage = <1800000>;
-};
-
-&pm8994_l23 {
-	regulator-min-microvolt = <1100000>;
-	regulator-max-microvolt = <1100000>;
-	qcom,init-voltage = <1100000>;
-};
-
-&pm8994_l27 {
-	regulator-min-microvolt = <800000>;
-	regulator-max-microvolt = <800000>;
-	qcom,init-voltage = <800000>;
-};
-
-&pm8994_l29 {
-	regulator-min-microvolt = <2500000>;
-	regulator-max-microvolt = <2500000>;
-	qcom,init-voltage = <2500000>;
-};
-
-&rpm_bus {
-	rpm-regulator-ldoa26 {
-		/delete-node/ pm8994_l26_corner;
-		/delete-node/ pm8994_l26_floor_corner;
-
-		pm8994_l26: regulator-l26 {
-			regulator-min-microvolt = <1100000>;
-			regulator-max-microvolt = <1100000>;
-			qcom,init-voltage = <1100000>;
-			status = "okay";
-		};
-	};
-
-	rpm-regulator-ldoa31 {
-		status = "okay";
-		pm8994_l31: regulator-l31 {
-			regulator-min-microvolt = <1100000>;
-			regulator-max-microvolt = <1100000>;
-			qcom,init-voltage = <1100000>;
-			status = "okay";
-		};
-	};
-};
-
-&gfx_vreg {
-	qcom,cpr-voltage-ceiling =
-		/* Speed bin 0 */
-		<600000  670000  670000  750000  830000  910000  960000 1020000
-		1070000>,
-
-		/* Speed bin 1 */
-		<600000  670000  670000  750000  830000  910000  960000 1020000
-		1070000>;
-
-	qcom,cpr-voltage-floor =
-		/* Speed bin 0 */
-		<600000  600000  600000  600000  600000  600000  600000  600000
-		 600000>,
-
-		/* Speed bin 1 */
-		<600000  600000  600000  600000  600000  600000  600000  600000
-		 600000>;
-};
diff --git a/arch/arm/boot/dts/qcom/msm8996pro-auto-cdp.dts b/arch/arm/boot/dts/qcom/msm8996pro-auto-cdp.dts
index e316f7af05f2..736fcba3bf27 100644
--- a/arch/arm/boot/dts/qcom/msm8996pro-auto-cdp.dts
+++ b/arch/arm/boot/dts/qcom/msm8996pro-auto-cdp.dts
@@ -15,6 +15,7 @@
 #include "msm8996pro.dtsi"
 #include "msm8996-pm8994.dtsi"
 #include "msm8996-auto-cdp.dtsi"
+#include "msm8996pro-auto.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. MSM 8996pro AUTO CDP";
@@ -39,22 +40,3 @@
 	pinctrl-0 = <&modem_mux>;
 };
 
-&gfx_vreg {
-	qcom,cpr-voltage-ceiling =
-		/* Speed bin 0 */
-		<600000  670000  670000  750000  830000  910000  960000 1020000
-		1070000>,
-
-		/* Speed bin 1 */
-		<600000  670000  670000  750000  830000  910000  960000 1020000
-		1070000>;
-
-	qcom,cpr-voltage-floor =
-		/* Speed bin 0 */
-		<600000  600000  600000  600000  600000  600000  600000  600000
-		 600000>,
-
-		/* Speed bin 1 */
-		<600000  600000  600000  600000  600000  600000  600000  600000
-		 600000>;
-};
diff --git a/arch/arm/boot/dts/qcom/msm8996pro-auto.dtsi b/arch/arm/boot/dts/qcom/msm8996pro-auto.dtsi
new file mode 100644
index 000000000000..bcb32a15a67e
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/msm8996pro-auto.dtsi
@@ -0,0 +1,33 @@
+/* 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.
+ */
+
+#include "msm8996v3-auto.dtsi"
+
+&gfx_vreg {
+	qcom,cpr-voltage-ceiling =
+		/* Speed bin 0 */
+		<600000  670000  670000  750000  830000  910000  960000 1020000
+		1070000>,
+
+		/* Speed bin 1 */
+		<600000  670000  670000  750000  830000  910000  960000 1020000
+		1070000>;
+
+	qcom,cpr-voltage-floor =
+		/* Speed bin 0 */
+		<600000  600000  600000  600000  600000  600000  600000  600000
+		 600000>,
+
+		/* Speed bin 1 */
+		<600000  600000  600000  600000  600000  600000  600000  600000
+		 600000>;
+};
diff --git a/arch/arm/boot/dts/qcom/msm8996pro-v1.1-auto-cdp.dts b/arch/arm/boot/dts/qcom/msm8996pro-v1.1-auto-cdp.dts
index 06b097025d4a..06d040aa6bcb 100644
--- a/arch/arm/boot/dts/qcom/msm8996pro-v1.1-auto-cdp.dts
+++ b/arch/arm/boot/dts/qcom/msm8996pro-v1.1-auto-cdp.dts
@@ -15,6 +15,7 @@
 #include "msm8996pro-v1.1.dtsi"
 #include "msm8996-pm8994.dtsi"
 #include "msm8996-auto-cdp.dtsi"
+#include "msm8996pro-auto.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. MSM 8996pro v1.1 AUTO CDP";
@@ -39,22 +40,3 @@
 	pinctrl-0 = <&modem_mux>;
 };
 
-&gfx_vreg {
-	qcom,cpr-voltage-ceiling =
-		/* Speed bin 0 */
-		<600000  670000  670000  750000  830000  910000  960000 1020000
-		1070000>,
-
-		/* Speed bin 1 */
-		<600000  670000  670000  750000  830000  910000  960000 1020000
-		1070000>;
-
-	qcom,cpr-voltage-floor =
-		/* Speed bin 0 */
-		<600000  600000  600000  600000  600000  600000  600000  600000
-		 600000>,
-
-		/* Speed bin 1 */
-		<600000  600000  600000  600000  600000  600000  600000  600000
-		 600000>;
-};
diff --git a/arch/arm/boot/dts/qcom/msm8996v3-auto.dtsi b/arch/arm/boot/dts/qcom/msm8996v3-auto.dtsi
new file mode 100644
index 000000000000..2e884b5915f1
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/msm8996v3-auto.dtsi
@@ -0,0 +1,96 @@
+/* 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.
+ */
+
+&hl7509_en_vreg {
+	status = "ok";
+};
+
+&hl7509_vreg {
+	status = "ok";
+};
+
+&gfx_cpr {
+	vdd-supply = <&hl7509_vreg>;
+	qcom,cpr-step-quot-init-min = <20>;
+	qcom,cpr-step-quot-init-max = <26>;
+	qcom,voltage-step = <10000>;
+	/delete-property/ qcom,cpr-enable;
+};
+
+&gfx_vreg {
+	qcom,cpr-voltage-ceiling =
+		<600000  670000  670000  750000  830000
+		 910000  960000 1020000>;
+	qcom,cpr-voltage-floor =
+		<600000  600000  600000  600000  600000
+		 600000  600000  600000>;
+};
+
+&pm8994_l3 {
+	regulator-min-microvolt = <875000>;
+	regulator-max-microvolt = <875000>;
+	qcom,init-voltage = <875000>;
+};
+
+&pm8994_l11 {
+	regulator-min-microvolt = <850000>;
+	regulator-max-microvolt = <850000>;
+	qcom,init-voltage = <850000>;
+};
+
+&pm8994_l17 {
+	regulator-min-microvolt = <1800000>;
+	regulator-max-microvolt = <1800000>;
+	qcom,init-voltage = <1800000>;
+};
+
+&pm8994_l23 {
+	regulator-min-microvolt = <1100000>;
+	regulator-max-microvolt = <1100000>;
+	qcom,init-voltage = <1100000>;
+};
+
+&pm8994_l27 {
+	regulator-min-microvolt = <800000>;
+	regulator-max-microvolt = <800000>;
+	qcom,init-voltage = <800000>;
+};
+
+&pm8994_l29 {
+	regulator-min-microvolt = <2500000>;
+	regulator-max-microvolt = <2500000>;
+	qcom,init-voltage = <2500000>;
+};
+
+&rpm_bus {
+	rpm-regulator-ldoa26 {
+		/delete-node/ pm8994_l26_corner;
+		/delete-node/ pm8994_l26_floor_corner;
+
+		pm8994_l26: regulator-l26 {
+			regulator-min-microvolt = <1100000>;
+			regulator-max-microvolt = <1100000>;
+			qcom,init-voltage = <1100000>;
+			status = "okay";
+		};
+	};
+
+	rpm-regulator-ldoa31 {
+		status = "okay";
+		pm8994_l31: regulator-l31 {
+			regulator-min-microvolt = <1100000>;
+			regulator-max-microvolt = <1100000>;
+			qcom,init-voltage = <1100000>;
+			status = "okay";
+		};
+	};
+};