diff --git a/arch/arm/boot/dts/qcom/Makefile b/arch/arm/boot/dts/qcom/Makefile
index a39f03c03761..627d84fc8ec9 100644
--- a/arch/arm/boot/dts/qcom/Makefile
+++ b/arch/arm/boot/dts/qcom/Makefile
@@ -42,6 +42,7 @@ dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \
 	msm8996pro-pmi8996-mtp.dtb \
 	msm8996pro-pmi8996-pmk8001-cdp.dtb \
 	msm8996pro-pmi8996-pmk8001-mtp.dtb \
+	msm8996pro-v1.1-auto-cdp.dtb \
 	msm8996pro-v1.1-pmi8994-cdp.dtb \
 	msm8996pro-v1.1-pmi8994-mtp.dtb \
 	msm8996pro-v1.1-pmi8994-pmk8001-cdp.dtb \
@@ -54,7 +55,9 @@ dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \
 	msm8996pro-v1.1-pmi8996-mtp.dtb \
 	msm8996pro-v1.1-pmi8996-pmk8001-cdp.dtb \
 	msm8996pro-v1.1-pmi8996-pmk8001-mtp.dtb \
+	apq8096pro-auto-cdp.dtb \
 	apq8096pro-liquid.dtb \
+	apq8096pro-v1.1-auto-cdp.dtb \
 	msm8996-v3.0-pmi8994-cdp.dtb \
 	msm8996-v3.0-pmi8994-mtp.dtb \
 	msm8996-v3.0-pmi8994-pm8004-cdp.dtb \
diff --git a/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dts b/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dts
new file mode 100644
index 000000000000..c4070f61ad47
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dts
@@ -0,0 +1,55 @@
+/* Copyright (c) 2015-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.
+ */
+
+/dts-v1/;
+
+#include "apq8096pro.dtsi"
+#include "msm8996-pm8994.dtsi"
+#include "msm8996-auto-cdp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. APQ 8096 pro AUTO CDP";
+	compatible = "qcom,apq8096-cdp", "qcom,apq8096", "qcom,cdp";
+	qcom,msm-id = <316 0x10000>;
+	qcom,board-id = <0x03010001 0>;
+};
+
+&spi_9 {
+	status = "ok";
+	can-controller@0 {
+		compatible = "renesas,rh850";
+		reg = <0>;
+		interrupt-parent = <&tlmm>;
+		interrupts = <127 0>;
+		spi-max-frequency = <5000000>;
+	};
+};
+
+&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
new file mode 100644
index 000000000000..323a23a3892b
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-cdp.dts
@@ -0,0 +1,55 @@
+/* Copyright (c) 2015-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.
+ */
+
+/dts-v1/;
+
+#include "apq8096pro-v1.1.dtsi"
+#include "msm8996-pm8994.dtsi"
+#include "msm8996-auto-cdp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. APQ 8096 pro v1.1 AUTO CDP";
+	compatible = "qcom,msm8996-cdp", "qcom,msm8996", "qcom,cdp";
+	qcom,msm-id = <316 0x10001>;
+	qcom,board-id = <0x03010001 0>;
+};
+
+&spi_9 {
+	status = "ok";
+	can-controller@0 {
+		compatible = "renesas,rh850";
+		reg = <0>;
+		interrupt-parent = <&tlmm>;
+		interrupts = <127 0>;
+		spi-max-frequency = <5000000>;
+	};
+};
+
+&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.dtsi b/arch/arm/boot/dts/qcom/apq8096pro-v1.1.dtsi
new file mode 100644
index 000000000000..043309f47bc6
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/apq8096pro-v1.1.dtsi
@@ -0,0 +1,34 @@
+/* Copyright (c) 2014-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.
+ */
+
+/*
+ * As a general rule, only version-specific property overrides should be placed
+ * inside this file. Common device definitions should be placed inside the
+ * msm8996.dtsi file.
+ */
+
+#include "msm8996pro-v1.1.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. APQ 8096 pro v1.1";
+	qcom,msm-id = <312 0x10001>;
+};
+
+&soc {
+	qcom,rmnet-ipa {
+		status = "disabled";
+	};
+};
+
+&ipa_hw {
+	status = "disabled";
+};
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
new file mode 100644
index 000000000000..06b097025d4a
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/msm8996pro-v1.1-auto-cdp.dts
@@ -0,0 +1,60 @@
+/* Copyright (c) 2015-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.
+ */
+
+/dts-v1/;
+
+#include "msm8996pro-v1.1.dtsi"
+#include "msm8996-pm8994.dtsi"
+#include "msm8996-auto-cdp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. MSM 8996pro v1.1 AUTO CDP";
+	compatible = "qcom,msm8996-cdp", "qcom,msm8996", "qcom,cdp";
+	qcom,msm-id = <315 0x10001>;
+	qcom,board-id = <0x03010001 0>;
+};
+
+&spi_9 {
+	status = "ok";
+	can-controller@0 {
+		compatible = "renesas,rh850";
+		reg = <0>;
+		interrupt-parent = <&tlmm>;
+		interrupts = <127 0>;
+		spi-max-frequency = <5000000>;
+	};
+};
+
+&pil_modem {
+	pinctrl-names = "default";
+	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/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c
index 008061412513..a25007041e0b 100644
--- a/drivers/soc/qcom/socinfo.c
+++ b/drivers/soc/qcom/socinfo.c
@@ -519,6 +519,7 @@ static struct msm_soc_info cpu_of_id[] = {
 	[311] = {MSM_CPU_8996, "APQ8096"},
 	[312] = {MSM_CPU_8996, "APQ8096pro"},
 	[315] = {MSM_CPU_8996, "MSM8996pro"},
+	[316] = {MSM_CPU_8996, "APQ8096pro"},
 
 	/* 8976 ID */
 	[266] = {MSM_CPU_8976, "MSM8976"},