From 3dea750ec4a495e1239a5ce4c5715a0fe24c0827 Mon Sep 17 00:00:00 2001
From: George Shen <quic_sqiao@quicinc.com>
Date: Wed, 17 Apr 2024 18:41:47 -0700
Subject: [PATCH 1/3] ARM: dts: msm: Add sun-eva-v2 dts

To enable v2 device bring up.

Change-Id: I363f29d138ad76c73574c7d1427feca6a38ba4dc
Signed-off-by: George Shen <quic_sqiao@quicinc.com>
---
 Kbuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Kbuild b/Kbuild
index 876d3c71..13dfa10a 100644
--- a/Kbuild
+++ b/Kbuild
@@ -2,6 +2,7 @@ ifneq ($(CONFIG_ARCH_QTI_VM), y)
 
 ifeq ($(CONFIG_ARCH_SUN), y)
 dtbo-y += sun-eva.dtbo
+dtbo-y += sun-eva-v2.dtbo
 endif
 
 ifeq ($(CONFIG_ARCH_PINEAPPLE), y)

From 827bf5dc2612b467b4c3e98a5e55cbc0647cefe5 Mon Sep 17 00:00:00 2001
From: George Shen <quic_sqiao@quicinc.com>
Date: Thu, 25 Apr 2024 13:47:51 -0700
Subject: [PATCH 2/3] ARM: dts: msm: Add SoC version

Enable version specific handling in FW and driver.

Change-Id: Ifc739584b04075c33fbbd308cbd576b4b8f8d2d8
Signed-off-by: George Shen <quic_sqiao@quicinc.com>
---
 sun-eva-v2.dtsi | 1 +
 sun-eva.dtsi    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/sun-eva-v2.dtsi b/sun-eva-v2.dtsi
index 3dc6d51f..ea98b6bb 100644
--- a/sun-eva-v2.dtsi
+++ b/sun-eva-v2.dtsi
@@ -7,5 +7,6 @@
 
 &msm_cvp {
 	qcom,allowed-clock-rates = <350000000 400000000 450000000 500000000 550000000>;
+	soc_ver = <0x20000>;
 };
 
diff --git a/sun-eva.dtsi b/sun-eva.dtsi
index 00bc6fcb..5b4a1cc8 100644
--- a/sun-eva.dtsi
+++ b/sun-eva.dtsi
@@ -46,6 +46,7 @@
 		qcom,gcc-reg = <0x110000 0x90000>;
 
 		pas-id = <26>;
+		soc_ver = <0x10000>;
 		memory-region = <&cvp_mem>;
 
 		/* UC region mapping */

From baeb53fab9a2879b845f549d472379984989b02f Mon Sep 17 00:00:00 2001
From: George Shen <quic_sqiao@quicinc.com>
Date: Fri, 3 May 2024 15:53:29 -0700
Subject: [PATCH 3/3] ARM: dts: msm: Include v2 dtsi in v2 dts

v2 setting will be dropped without the fix.

Change-Id: I7b9b4599e6e3966683fba322c6fd151b7be2b6cc
Signed-off-by: George Shen <quic_sqiao@quicinc.com>
---
 sun-eva-v2.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sun-eva-v2.dts b/sun-eva-v2.dts
index 1247204e..75e6b2a6 100644
--- a/sun-eva-v2.dts
+++ b/sun-eva-v2.dts
@@ -13,7 +13,7 @@
 #include <dt-bindings/clock/qcom,gcc-sun.h>
 #include <dt-bindings/clock/qcom,evacc-sun.h>
 #include <dt-bindings/arm/msm/qti-smmu-proxy-dt-ids.h>
-#include "sun-eva.dtsi"
+#include "sun-eva-v2.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. Sun v2 SoC";