From cbee11692d0051eed5255bcbea9697e95698a7ad Mon Sep 17 00:00:00 2001
From: Vamsi Krishna Lanka <vamslank@qti.qualcomm.com>
Date: Wed, 19 Jan 2022 12:52:52 -0800
Subject: [PATCH] ARM: dts: msm: Add support for Kalama v2

Add initial devicetree support for kalama v2 SoC.

Change-Id: I5457662bf24477457a65d7b427f4a6514eddcf36
---
 qcom/Makefile                | 4 ++--
 qcom/kalama-cdp-overlay.dts  | 2 +-
 qcom/kalama-mtp-overlay.dts  | 2 +-
 qcom/kalama-qrd-overlay.dts  | 2 +-
 qcom/kalama-rumi-overlay.dts | 2 +-
 qcom/kalama-v2.dts           | 9 +++++++++
 qcom/kalama-v2.dtsi          | 7 +++++++
 qcom/kalamap-v2.dts          | 9 +++++++++
 qcom/kalamap-v2.dtsi         | 7 +++++++
 9 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 qcom/kalama-v2.dts
 create mode 100644 qcom/kalama-v2.dtsi
 create mode 100644 qcom/kalamap-v2.dts
 create mode 100644 qcom/kalamap-v2.dtsi

diff --git a/qcom/Makefile b/qcom/Makefile
index 075d3028..70bec732 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -44,8 +44,8 @@ waipio-overlays-dtb-$(CONFIG_ARCH_WAIPIO) += $(WAIPIO_BOARDS) $(NOAPQ_WAIPIO_BOA
 dtb-y += $(waipio-dtb-y)
 
 
-KALAMA_BASE_DTB += kalama.dtb
-KALAMA_APQ_BASE_DTB += kalamap.dtb
+KALAMA_BASE_DTB += kalama.dtb kalama-v2.dtb
+KALAMA_APQ_BASE_DTB += kalamap.dtb kalamap-v2.dtb
 
 KALAMA_BOARDS += \
 		 kalama-mtp-overlay.dtbo \
diff --git a/qcom/kalama-cdp-overlay.dts b/qcom/kalama-cdp-overlay.dts
index df9043fd..82ad1a09 100644
--- a/qcom/kalama-cdp-overlay.dts
+++ b/qcom/kalama-cdp-overlay.dts
@@ -6,6 +6,6 @@
 / {
 	model = "Qualcomm Technologies, Inc. Kalama CDP";
 	compatible = "qcom,kalama-cdp", "qcom,kalama", "qcom,cdp";
-	qcom,msm-id = <519 0x10000>, <536 0x10000>;
+	qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>;
 	qcom,board-id = <0x10001 0>;
 };
diff --git a/qcom/kalama-mtp-overlay.dts b/qcom/kalama-mtp-overlay.dts
index 26cac7ce..10a9811c 100644
--- a/qcom/kalama-mtp-overlay.dts
+++ b/qcom/kalama-mtp-overlay.dts
@@ -6,6 +6,6 @@
 / {
 	model = "Qualcomm Technologies, Inc. Kalama MTP";
 	compatible = "qcom,kalama-mtp", "qcom,kalama", "qcom,mtp";
-	qcom,msm-id = <519 0x10000>, <536 0x10000>;
+	qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>;
 	qcom,board-id = <0x10008 0>;
 };
diff --git a/qcom/kalama-qrd-overlay.dts b/qcom/kalama-qrd-overlay.dts
index 9934cda7..1631e94c 100644
--- a/qcom/kalama-qrd-overlay.dts
+++ b/qcom/kalama-qrd-overlay.dts
@@ -6,6 +6,6 @@
 / {
 	model = "Qualcomm Technologies, Inc. Kalama RUMI";
 	compatible = "qcom,kalama-qrd", "qcom,kalama", "qcom,qrd";
-	qcom,msm-id = <519 0x10000>, <536 0x10000>;
+	qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>;
 	qcom,board-id = <0x1000B 0>;
 };
diff --git a/qcom/kalama-rumi-overlay.dts b/qcom/kalama-rumi-overlay.dts
index e1fa6221..401647ef 100644
--- a/qcom/kalama-rumi-overlay.dts
+++ b/qcom/kalama-rumi-overlay.dts
@@ -6,6 +6,6 @@
 / {
 	model = "Qualcomm Technologies, Inc. Kalama RUMI";
 	compatible = "qcom,kalama-rumi", "qcom,kalama", "qcom,rumi";
-	qcom,msm-id = <519 0x10000>;
+	qcom,msm-id = <519 0x10000>, <519 0x20000>;
 	qcom,board-id = <0x1000F 0>;
 };
diff --git a/qcom/kalama-v2.dts b/qcom/kalama-v2.dts
new file mode 100644
index 00000000..5a358264
--- /dev/null
+++ b/qcom/kalama-v2.dts
@@ -0,0 +1,9 @@
+/dts-v1/;
+
+#include "kalama-v2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Kalama v2 SoC";
+	compatible = "qcom,kalama";
+	qcom,board-id = <0 0>;
+};
diff --git a/qcom/kalama-v2.dtsi b/qcom/kalama-v2.dtsi
new file mode 100644
index 00000000..95499d3a
--- /dev/null
+++ b/qcom/kalama-v2.dtsi
@@ -0,0 +1,7 @@
+#include "kalama.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Kalama v2 SoC";
+	compatible = "qcom,kalama";
+	qcom,msm-id = <519 0x20000>;
+};
diff --git a/qcom/kalamap-v2.dts b/qcom/kalamap-v2.dts
new file mode 100644
index 00000000..cc3e015b
--- /dev/null
+++ b/qcom/kalamap-v2.dts
@@ -0,0 +1,9 @@
+/dts-v1/;
+
+#include "kalamap-v2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. KalamaP v2 SoC";
+	compatible = "qcom,kalamap";
+	qcom,board-id = <0 0>;
+};
diff --git a/qcom/kalamap-v2.dtsi b/qcom/kalamap-v2.dtsi
new file mode 100644
index 00000000..d3a964a0
--- /dev/null
+++ b/qcom/kalamap-v2.dtsi
@@ -0,0 +1,7 @@
+#include "kalamap.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. KalamaP v2 SoC";
+	compatible = "qcom,kalamap";
+	qcom,msm-id = <536 0x20000>;
+};