ARM: dts: msm: add device tree overlay for 8996 V3

Add device tree overlay support for 8996 V3 HW.

Change-Id: Icbb62aef6629778ac3b57716956927d32c0a9a0f
Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>

8 files changed, 121 insertions, 31 deletions

diff --git a/arch/arm/boot/dts/qcom/Makefile b/arch/arm/boot/dts/qcom/Makefile
index 6689141120c3..d0990e3252aa 100644
--- a/arch/arm/boot/dts/qcom/Makefile
+++ b/arch/arm/boot/dts/qcom/Makefile
@@ -1,6 +1,7 @@
 ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
 dtbo-$(CONFIG_ARCH_MSM8996) += \
 	msm8996-mtp-overlay.dtbo \
+	msm8996-cdp-overlay.dtbo \
 	apq8096pro-v1.1-auto-adp-overlay.dtbo \
 	apq8096pro-v1.1-auto-adp-lite-overlay.dtbo \
 	msm8996pro-auto-adp-overlay.dtbo \
@@ -10,7 +11,13 @@ dtbo-$(CONFIG_ARCH_MSM8996) += \
 
 msm8996-mtp-overlay.dtbo-base :=  msm8996pro-v1.1-pmi8996.dtb \
 				msm8996-v3-pmi8996.dtb \
-				msm8996pro-v1.1-pmi8994.dtb
+				msm8996pro-v1.1-pmi8994.dtb \
+				msm8996-v313-pmi8994.dtb \
+				msm8996-v30-pm8994-pmi8994-pm8004.dtb
+
+msm8996-cdp-overlay.dtbo-base :=  msm8996-v3-pmi8994.dtb \
+				 msm8996pro-pmi8994-pm8004.dtb
+
 apq8096pro-v1.1-auto-adp-overlay.dtbo-base := apq8096pro-v1.1-auto.dtb
 apq8096pro-v1.1-auto-adp-lite-overlay.dtbo-base := apq8096pro-v1.1-auto.dtb
 msm8996pro-auto-adp-overlay.dtbo-base := msm8996pro-auto.dtb
diff --git a/arch/arm/boot/dts/qcom/msm8996-cdp-overlay.dts b/arch/arm/boot/dts/qcom/msm8996-cdp-overlay.dts
new file mode 100644
index 000000000000..3cb30f967c08
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/msm8996-cdp-overlay.dts
@@ -0,0 +1,22 @@
+/* Copyright (c) 2019, 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/;
+/plugin/;
+
+#include "msm8996-cdp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. MSM 8996 CDP";
+	compatible = "qcom,msm8996-cdp", "qcom,msm8996", "qcom,cdp";
+	qcom,board-id = <1 0>, <0x01000001 0>;
+};
diff --git a/arch/arm/boot/dts/qcom/msm8996-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8996-cdp.dtsi
index f544934c84e4..170e2d8aaecc 100644
--- a/arch/arm/boot/dts/qcom/msm8996-cdp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-cdp.dtsi
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2016,2018, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, 2018-2019, 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
@@ -10,7 +10,7 @@
  * GNU General Public License for more details.
  */
 
-#include "msm8996-pinctrl.dtsi"
+#include <dt-bindings/clock/msm-clocks-8996.h>
 #include "msm8996-camera-sensor-cdp.dtsi"
 #include "msm8996-wsa881x.dtsi"
 
@@ -201,17 +201,6 @@
 		qcom,hw-settle-time = <2>;
 		qcom,fast-avg-setup = <0>;
 	};
-
-	chan@7c {
-		label = "xo_therm_buf";
-		reg = <0x7c>;
-		qcom,decimation = <0>;
-		qcom,pre-div-channel-scaling = <0>;
-		qcom,calibration-type = "ratiometric";
-		qcom,scale-function = <4>;
-		qcom,hw-settle-time = <2>;
-		qcom,fast-avg-setup = <0>;
-	};
 };
 
 &pm8994_adc_tm {
diff --git a/arch/arm/boot/dts/qcom/msm8996-v3-pmi8994.dts b/arch/arm/boot/dts/qcom/msm8996-v3-pmi8994.dts
new file mode 100644
index 000000000000..cb7b194ebfa1
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/msm8996-v3-pmi8994.dts
@@ -0,0 +1,24 @@
+/* Copyright (c) 2019, 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 "msm8996-v3.dtsi"
+#include "msm8996-pm8994-pmi8994-pm8004.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. MSM 8996 v3 + PMI8994 + PM8004";
+	compatible = "qcom,msm8996";
+	qcom,pmic-id = <0x20009 0x2000A 0x1000C 0x0>;
+	qcom,msm-id = <246 0x30001>;
+	qcom,pmic-name = "PMI8994";
+};
diff --git a/arch/arm/boot/dts/qcom/msm8996-v30-pm8994-pmi8994-pm8004.dts b/arch/arm/boot/dts/qcom/msm8996-v30-pm8994-pmi8994-pm8004.dts
new file mode 100644
index 000000000000..c0368f188374
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/msm8996-v30-pm8994-pmi8994-pm8004.dts
@@ -0,0 +1,24 @@
+/* Copyright (c) 2019, 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 "msm8996-v3.0.dtsi"
+#include "msm8996-pm8994-pmi8994-pm8004.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. MSM 8996 v3.0 + PMI8994 + PM8004";
+	compatible = "qcom,msm8996";
+	qcom,pmic-id = <0x20009 0x2000A 0x1000C 0x0>;
+	qcom,msm-id = <246 0x30000>;
+	qcom,pmic-name = "PMI8994";
+};
diff --git a/arch/arm/boot/dts/qcom/msm8996-v313-pmi8994.dts b/arch/arm/boot/dts/qcom/msm8996-v313-pmi8994.dts
new file mode 100644
index 000000000000..357e9095424c
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/msm8996-v313-pmi8994.dts
@@ -0,0 +1,16 @@
+/* Copyright (c) 2019, 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 "msm8996-v3.dtsi"
diff --git a/arch/arm/boot/dts/qcom/msm8996pro-pmi8994-pm8004.dts b/arch/arm/boot/dts/qcom/msm8996pro-pmi8994-pm8004.dts
new file mode 100644
index 000000000000..d188551c2211
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/msm8996pro-pmi8994-pm8004.dts
@@ -0,0 +1,24 @@
+/* Copyright (c) 2019, 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.dtsi"
+#include "msm8996-pm8994-pmi8994-pm8004.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8994 + PM8004";
+	compatible = "qcom,msm8996";
+	qcom,pmic-id = <0x20009 0x2000A 0x1000C 0x0>;
+	qcom,msm-id = <305 0x10000>;
+	qcom,pmic-name = "PMI8994";
+};
diff --git a/arch/arm/boot/dts/qcom/msm8996pro-v1.1-pmi8994.dts b/arch/arm/boot/dts/qcom/msm8996pro-v1.1-pmi8994.dts
index f54f012f9270..0cc4fb249c19 100644
--- a/arch/arm/boot/dts/qcom/msm8996pro-v1.1-pmi8994.dts
+++ b/arch/arm/boot/dts/qcom/msm8996pro-v1.1-pmi8994.dts
@@ -13,7 +13,7 @@
 /dts-v1/;
 
 #include "msm8996pro-v1.1.dtsi"
-#include "msm-pm8004.dtsi"
+#include "msm8996-pm8994-pmi8994-pm8004.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. MSM 8996pro v1.1 + PMI8994";
@@ -22,19 +22,3 @@
 	qcom,msm-id = <305 0x10001>;
 	qcom,pmic-name = "PMI8994";
 };
-
-/*
- * Override PMI8994 resources with proper PM8004 resources for MSM8996 with
- * PM8004.
- */
-&pmi8994_s2 {
-	status = "disabled";
-};
-
-&pm8004_s2 {
-	status = "ok";
-};
-
-&gfx_cpr {
-	vdd-supply = <&pm8004_s2>;
-};