From 7ba8ff5fe03e96ad6021ee1409166be0ddb930fb Mon Sep 17 00:00:00 2001
From: Prakruthi Deepak Heragu <pheragu@quicinc.com>
Date: Mon, 13 Apr 2020 15:02:45 -0700
Subject: [PATCH] ARM: dts: qcom: Add device tree files for lahaina & lahainap
 v2

Add devicetree files for supporting lahaina & lahainap v2 configuration.

Change-Id: I830db076a76443e71d2dbd105a7289d566d1d80b
---
 qcom/Makefile            | 20 +++++++++++++-------
 qcom/lahaina-v2-cdp.dts  | 10 ++++++++++
 qcom/lahaina-v2-mtp.dts  | 10 ++++++++++
 qcom/lahaina-v2-qrd.dts  | 10 ++++++++++
 qcom/lahaina-v2.dts      |  9 +++++++++
 qcom/lahaina-v2.dtsi     |  8 ++++++++
 qcom/lahainap-v2-cdp.dts | 10 ++++++++++
 qcom/lahainap-v2-mtp.dts | 10 ++++++++++
 qcom/lahainap-v2-qrd.dts | 10 ++++++++++
 qcom/lahainap-v2.dts     |  9 +++++++++
 qcom/lahainap-v2.dtsi    | 15 +++++++++++++++
 11 files changed, 114 insertions(+), 7 deletions(-)
 create mode 100644 qcom/lahaina-v2-cdp.dts
 create mode 100644 qcom/lahaina-v2-mtp.dts
 create mode 100644 qcom/lahaina-v2-qrd.dts
 create mode 100644 qcom/lahaina-v2.dts
 create mode 100644 qcom/lahaina-v2.dtsi
 create mode 100644 qcom/lahainap-v2-cdp.dts
 create mode 100644 qcom/lahainap-v2-mtp.dts
 create mode 100644 qcom/lahainap-v2-qrd.dts
 create mode 100644 qcom/lahainap-v2.dts
 create mode 100644 qcom/lahainap-v2.dtsi

diff --git a/qcom/Makefile b/qcom/Makefile
index f37a9a3e87fd..1d558aba7d77 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -13,14 +13,14 @@ dtbo-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi-overlay.dtbo \
 
 lahaina-rumi-overlay.dtbo-base := lahaina.dtb
 lahaina-mtp-hsp-overlay.dtbo-base := lahaina.dtb
-lahaina-mtp-overlay.dtbo-base := lahaina.dtb
-lahaina-cdp-overlay.dtbo-base := lahaina.dtb
+lahaina-mtp-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb
+lahaina-cdp-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb
 lahaina-qrd-hsp-overlay.dtbo-base := lahaina.dtb
-lahaina-qrd-overlay.dtbo-base := lahaina.dtb
+lahaina-qrd-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb
 lahaina-qrd-module-overlay.dtbo-base := lahaina.dtb
-lahainap-mtp-overlay.dtbo-base := lahainap.dtb
-lahainap-cdp-overlay.dtbo-base := lahainap.dtb
-lahainap-qrd-overlay.dtbo-base := lahainap.dtb
+lahainap-mtp-overlay.dtbo-base := lahainap.dtb lahainap-v2.dtb
+lahainap-cdp-overlay.dtbo-base := lahainap.dtb lahainap-v2.dtb
+lahainap-qrd-overlay.dtbo-base := lahainap.dtb lahainap-v2.dtb
 else
 dtb-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi.dtb \
 	lahaina-mtp-hsp.dtb \
@@ -31,7 +31,13 @@ dtb-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi.dtb \
 	lahaina-qrd-module.dtb \
 	lahainap-mtp.dtb \
 	lahainap-cdp.dtb \
-	lahainap-qrd.dtb
+	lahainap-qrd.dtb \
+	lahaina-v2-mtp.dtb \
+	lahaina-v2-cdp.dtb \
+	lahaina-v2-qrd.dtb \
+	lahainap-v2-mtp.dtb \
+	lahainap-v2-cdp.dtb \
+	lahainap-v2-qrd.dtb
 endif
 
 ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
diff --git a/qcom/lahaina-v2-cdp.dts b/qcom/lahaina-v2-cdp.dts
new file mode 100644
index 000000000000..07fd670d8d88
--- /dev/null
+++ b/qcom/lahaina-v2-cdp.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "lahaina-v2.dtsi"
+#include "lahaina-cdp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Lahaina V2 CDP";
+	compatible = "qcom,lahaina-cdp", "qcom,lahaina", "qcom,cdp";
+	qcom,board-id = <0x10001 0>;
+};
diff --git a/qcom/lahaina-v2-mtp.dts b/qcom/lahaina-v2-mtp.dts
new file mode 100644
index 000000000000..d417dd17cffb
--- /dev/null
+++ b/qcom/lahaina-v2-mtp.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "lahaina-v2.dtsi"
+#include "lahaina-mtp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Lahaina V2 MTP";
+	compatible = "qcom,lahaina-mtp", "qcom,lahaina", "qcom,mtp";
+	qcom,board-id = <0x10008 0>;
+};
diff --git a/qcom/lahaina-v2-qrd.dts b/qcom/lahaina-v2-qrd.dts
new file mode 100644
index 000000000000..941da5171317
--- /dev/null
+++ b/qcom/lahaina-v2-qrd.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "lahaina-v2.dtsi"
+#include "lahaina-qrd.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Lahaina V2 QRD";
+	compatible = "qcom,lahaina-qrd", "qcom,lahaina", "qcom,qrd";
+	qcom,board-id = <0x1000B 0>;
+};
diff --git a/qcom/lahaina-v2.dts b/qcom/lahaina-v2.dts
new file mode 100644
index 000000000000..0d69502909d2
--- /dev/null
+++ b/qcom/lahaina-v2.dts
@@ -0,0 +1,9 @@
+/dts-v1/;
+
+#include "lahaina-v2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Lahaina V2 SoC";
+	compatible = "qcom,lahaina";
+	qcom,board-id = <0 0>;
+};
diff --git a/qcom/lahaina-v2.dtsi b/qcom/lahaina-v2.dtsi
new file mode 100644
index 000000000000..8e7453c463d4
--- /dev/null
+++ b/qcom/lahaina-v2.dtsi
@@ -0,0 +1,8 @@
+#include "lahaina.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Lahaina v2";
+	compatible = "qcom,lahaina";
+	qcom,msm-id = <415 0x20000>;
+};
+
diff --git a/qcom/lahainap-v2-cdp.dts b/qcom/lahainap-v2-cdp.dts
new file mode 100644
index 000000000000..8ec9deac9a41
--- /dev/null
+++ b/qcom/lahainap-v2-cdp.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "lahainap-v2.dtsi"
+#include "lahainap-cdp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. LahainaP v2 CDP";
+	compatible = "qcom,lahainap-cdp", "qcom,lahainap", "qcom,cdp";
+	qcom,board-id = <0x10001 0>;
+};
diff --git a/qcom/lahainap-v2-mtp.dts b/qcom/lahainap-v2-mtp.dts
new file mode 100644
index 000000000000..354900ba61f9
--- /dev/null
+++ b/qcom/lahainap-v2-mtp.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "lahainap-v2.dtsi"
+#include "lahainap-mtp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. LahainaP v2 MTP";
+	compatible = "qcom,lahainap-mtp", "qcom,lahainap", "qcom,mtp";
+	qcom,board-id = <0x10008 0>;
+};
diff --git a/qcom/lahainap-v2-qrd.dts b/qcom/lahainap-v2-qrd.dts
new file mode 100644
index 000000000000..9f630947a249
--- /dev/null
+++ b/qcom/lahainap-v2-qrd.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "lahainap-v2.dtsi"
+#include "lahainap-cdp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. LahainaP v2 QRD";
+	compatible = "qcom,lahainap-qrd", "qcom,lahainap", "qcom,qrd";
+	qcom,board-id = <0x1000B 0>;
+};
diff --git a/qcom/lahainap-v2.dts b/qcom/lahainap-v2.dts
new file mode 100644
index 000000000000..df19bd2a5cd3
--- /dev/null
+++ b/qcom/lahainap-v2.dts
@@ -0,0 +1,9 @@
+/dts-v1/;
+
+#include "lahainap-v2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. LahianaP v2 SoC";
+	compatible = "qcom,lahainap";
+	qcom,board-id = <0 0>;
+};
diff --git a/qcom/lahainap-v2.dtsi b/qcom/lahainap-v2.dtsi
new file mode 100644
index 000000000000..c6f6b0305032
--- /dev/null
+++ b/qcom/lahainap-v2.dtsi
@@ -0,0 +1,15 @@
+#include "lahaina-v2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. LahainaP v2";
+	compatible = "qcom,lahainap";
+	qcom,msm-id = <439 0x20000>;
+};
+
+&pil_modem {
+	status = "disabled";
+};
+
+&ipa_hw {
+	status = "disabled";
+};