From 25cd1caa2b249469ea7a61cbfdd93f7f367707d8 Mon Sep 17 00:00:00 2001
From: Unnathi Chalicheemala <quic_uchalich@quicinc.com>
Date: Fri, 7 Jul 2023 11:30:17 -0700
Subject: [PATCH] ARM: dts: msm: Support for Sun v2 SoC

Added initial Sun v2 device tree support.
Added v2 support in MTP, CDP, QRD overlays.

Change-Id: I47f7bb69bac837dc9f6c646130240b562ce7c827
Signed-off-by: Unnathi Chalicheemala <quic_uchalich@quicinc.com>
---
 qcom/Makefile            |  2 +-
 qcom/platform_map.bzl    |  5 +++--
 qcom/sun-cdp-overlay.dts |  2 +-
 qcom/sun-mtp-overlay.dts |  2 +-
 qcom/sun-qrd-overlay.dts |  2 +-
 qcom/sun-v2.dts          | 14 ++++++++++++++
 qcom/sun-v2.dtsi         | 11 +++++++++++
 7 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 qcom/sun-v2.dts
 create mode 100644 qcom/sun-v2.dtsi

diff --git a/qcom/Makefile b/qcom/Makefile
index 4d8219fb..8d1d1527 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -15,7 +15,7 @@ add-overlays = $(foreach o,$1,$(foreach b,$2,$(eval $(basename $b)-$(basename $o
 
 ifneq ($(CONFIG_ARCH_QTI_VM), y)
 
-SUN_BASE_DTB += sun.dtb
+SUN_BASE_DTB += sun.dtb sun-v2.dtb
 
 SUN_BOARDS += \
 		 sun-mtp-overlay.dtbo \
diff --git a/qcom/platform_map.bzl b/qcom/platform_map.bzl
index 472a9388..16f9aabe 100644
--- a/qcom/platform_map.bzl
+++ b/qcom/platform_map.bzl
@@ -3,6 +3,7 @@ _platform_map = {
         "dtb_list": [
             # keep sorted
             {"name": "sun.dtb"},
+            {"name": "sun-v2.dtb"},
         ],
         "dtbo_list": [
             # keep sorted
@@ -67,8 +68,8 @@ def _get_dtb_lists(target, dt_overlay_supported):
 
     return ret
 
-def get_dtb_list(target, dt_overlay_supported=True):
+def get_dtb_list(target, dt_overlay_supported = True):
     return [dtb["name"] for dtb in _get_dtb_lists(target, dt_overlay_supported).get("dtb_list", [])]
 
-def get_dtbo_list(target, dt_overlay_supported=True):
+def get_dtbo_list(target, dt_overlay_supported = True):
     return [dtb["name"] for dtb in _get_dtb_lists(target, dt_overlay_supported).get("dtbo_list", [])]
diff --git a/qcom/sun-cdp-overlay.dts b/qcom/sun-cdp-overlay.dts
index f1f74851..97abb08f 100644
--- a/qcom/sun-cdp-overlay.dts
+++ b/qcom/sun-cdp-overlay.dts
@@ -11,6 +11,6 @@
 / {
 	model = "Qualcomm Technologies, Inc. Sun CDP";
 	compatible = "qcom,sun-cdp", "qcom,sun", "qcom,cdp";
-	qcom,msm-id = <618 0x10000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>;
 	qcom,board-id = <1 0>;
 };
diff --git a/qcom/sun-mtp-overlay.dts b/qcom/sun-mtp-overlay.dts
index a5740b7f..891692f9 100644
--- a/qcom/sun-mtp-overlay.dts
+++ b/qcom/sun-mtp-overlay.dts
@@ -11,6 +11,6 @@
 / {
 	model = "Qualcomm Technologies, Inc. Sun MTP";
 	compatible = "qcom,sun-mtp", "qcom,sun", "qcom,mtp";
-	qcom,msm-id = <618 0x10000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>;
 	qcom,board-id = <8 0>;
 };
diff --git a/qcom/sun-qrd-overlay.dts b/qcom/sun-qrd-overlay.dts
index 0479ce38..556196f9 100644
--- a/qcom/sun-qrd-overlay.dts
+++ b/qcom/sun-qrd-overlay.dts
@@ -11,6 +11,6 @@
 / {
 	model = "Qualcomm Technologies, Inc. Sun QRD";
 	compatible = "qcom,sun-qrd", "qcom,sun", "qcom,qrd";
-	qcom,msm-id = <618 0x10000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>;
 	qcom,board-id = <11 0>;
 };
diff --git a/qcom/sun-v2.dts b/qcom/sun-v2.dts
new file mode 100644
index 00000000..633c15c4
--- /dev/null
+++ b/qcom/sun-v2.dts
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+
+#include "sun-v2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Sun v2 SoC";
+	compatible = "qcom,sun";
+	qcom,board-id = <0 0>;
+};
diff --git a/qcom/sun-v2.dtsi b/qcom/sun-v2.dtsi
new file mode 100644
index 00000000..2bc90d41
--- /dev/null
+++ b/qcom/sun-v2.dtsi
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+#include "sun.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Sun v2 SoC";
+	compatible = "qcom,sun";
+	qcom,msm-id = <618 0x20000>;
+};