From 995920c7f98597ede335d543d7d92149f0cca5e4 Mon Sep 17 00:00:00 2001
From: Patrick Daly <quic_pdaly@quicinc.com>
Date: Wed, 28 Jun 2023 18:29:57 -0700
Subject: [PATCH] ARM: dts: msm: Update to memory map v2 for sun

Update to the newest memory map version.

Change-Id: I1170604016947220f51c33887a87eef21b7ebd23
Signed-off-by: Patrick Daly <quic_pdaly@quicinc.com>
---
 qcom/sun.dtsi | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/qcom/sun.dtsi b/qcom/sun.dtsi
index c241a8bb..e526248c 100644
--- a/qcom/sun.dtsi
+++ b/qcom/sun.dtsi
@@ -978,19 +978,19 @@
 		reg = <0x0 0x81d00000 0x0 0x200000>;
 	};
 
-	adsp_mhi_mem: adsp_mhi_region@81f00000 {
+	pdp_ns_shared_mem: pdp_ns_shared_region@81f00000 {
 		no-map;
-		reg = <0x0 0x81f00000 0x0 0x20000>;
+		reg = <0x0 0x81f00000 0x0 0x100000>;
 	};
 
-	cpucp_scandump_mem: cpucp_scandump_region@81f20000 {
+	cpucp_scandump_mem: cpucp_scandump_region@82000000 {
 		no-map;
-		reg = <0x0 0x81f20000 0x0 0x380000>;
+		reg = <0x0 0x82000000 0x0 0x380000>;
 	};
 
-	pdp_ns_shared_mem: pdp_ns_shared_region@822a0000 {
+	adsp_mhi_mem: adsp_mhi_region@82380000 {
 		no-map;
-		reg = <0x0 0x822a0000 0x0 0x100000>;
+		reg = <0x0 0x82380000 0x0 0x20000>;
 	};
 
 	soccp_sdi_mem: soccp_sdi_region@823a0000 {
@@ -1076,39 +1076,44 @@
 		reg = <0x0 0x9b300000 0x0 0x800000>;
 	};
 
-	video_mem: video_region@9bb00000 {
+	camera_2_mem: camera_2_region@9bb00000 {
 		no-map;
 		reg = <0x0 0x9bb00000 0x0 0x800000>;
 	};
 
-	cvp_mem: cvp_region@9c300000 {
+	video_mem: video_region@9c300000 {
 		no-map;
-		reg = <0x0 0x9c300000 0x0 0x700000>;
+		reg = <0x0 0x9c300000 0x0 0x800000>;
 	};
 
-	cdsp_mem: cdsp_region@9ca00000 {
+	cvp_mem: cvp_region@9cb00000 {
 		no-map;
-		reg = <0x0 0x9ca00000 0x0 0x2000000>;
+		reg = <0x0 0x9cb00000 0x0 0x700000>;
 	};
 
-	q6_cdsp_dtb_mem: q6_cdsp_dtb_region@9ea00000 {
+	cdsp_mem: cdsp_region@9d200000 {
 		no-map;
-		reg = <0x0 0x9ea00000 0x0 0x80000>;
+		reg = <0x0 0x9d200000 0x0 0x2000000>;
 	};
 
-	q6_adsp_dtb_mem: q6_adsp_dtb_region@9ea80000 {
+	q6_cdsp_dtb_mem: q6_cdsp_dtb_region@9f200000 {
 		no-map;
-		reg = <0x0 0x9ea80000 0x0 0x80000>;
+		reg = <0x0 0x9f200000 0x0 0x80000>;
 	};
 
-	adspslpi_mem: adspslpi_region@9eb00000 {
+	q6_adsp_dtb_mem: q6_adsp_dtb_region@9f280000 {
 		no-map;
-		reg = <0x0 0x9eb00000 0x0 0x4080000>;
+		reg = <0x0 0x9f280000 0x0 0x80000>;
 	};
 
-	soccp_mem: soccp_region@a2b80000 {
+	adspslpi_mem: adspslpi_region@9f300000 {
 		no-map;
-		reg = <0x0 0xa2b80000 0x0 0x100000>;
+		reg = <0x0 0x9f300000 0x0 0x4080000>;
+	};
+
+	soccp_mem: soccp_region@a3380000 {
+		no-map;
+		reg = <0x0 0xa3380000 0x0 0x100000>;
 	};
 
 	/* uefi region can be reused by apps */