From 3cc57456e0fa1dadc45668ef335e2dfc5db8ce83 Mon Sep 17 00:00:00 2001
From: Andhavarapu Karthik <kartkart@qti.qualcomm.com>
Date: Thu, 28 Jan 2021 17:03:10 +0530
Subject: [PATCH] ARM: dts: qcom: enable display on trusted vm for yupik

Enable display on trusted vm for yupik target by including
display dt files. Add entry to use non secure display heap
memory for TUI usecase for yupik target.

Change-Id: Iaf821ddf8017f1341e23bca3a8450f0797990b7a
---
 qcom/yupik-ion.dtsi |  6 ++++++
 qcom/yupik-vm.dtsi  |  5 +++++
 qcom/yupik.dtsi     | 13 +++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/qcom/yupik-ion.dtsi b/qcom/yupik-ion.dtsi
index 003a0bd46c2c..a2ed081c6d53 100644
--- a/qcom/yupik-ion.dtsi
+++ b/qcom/yupik-ion.dtsi
@@ -54,6 +54,12 @@
 			memory-region = <&audio_cma_mem>;
 			qcom,ion-heap-type = "DMA";
 		};
+
+		qcom,ion-heap@3 { /* NON SECURE DISPLAY HEAP */
+			reg = <ION_DISPLAY_HEAP_ID>;
+			memory-region = <&non_secure_display_memory>;
+			qcom,ion-heap-type = "DMA";
+		};
 	};
 };
 
diff --git a/qcom/yupik-vm.dtsi b/qcom/yupik-vm.dtsi
index 46dcb20a5464..0bd0c231c776 100644
--- a/qcom/yupik-vm.dtsi
+++ b/qcom/yupik-vm.dtsi
@@ -1,4 +1,7 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/clock/qcom,dispcc-yupik.h>
+#include <dt-bindings/clock/qcom,gcc-yupik.h>
+#include <dt-bindings/clock/qcom,rpmh.h>
 
 / {
 	#address-cells = <0x2>;
@@ -297,3 +300,5 @@
 	};
 };
 #include "lahaina-vm-ion.dtsi"
+#include "display/trustedvm-yupik-sde.dtsi"
+#include "display/trustedvm-yupik-sde-display.dtsi"
diff --git a/qcom/yupik.dtsi b/qcom/yupik.dtsi
index 2bb77e584aec..fa4c15391916 100644
--- a/qcom/yupik.dtsi
+++ b/qcom/yupik.dtsi
@@ -432,6 +432,19 @@
 		size = <0x0 0x1400000>;
 	};
 
+	non_secure_display_memory: non_secure_display_region {
+		compatible = "shared-dma-pool";
+		alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
+		reusable;
+		alignment = <0x0 0x400000>;
+		size = <0x0 0x6400000>;
+	};
+
+	splash_memory:splash_region {
+		reg = <0x0 0xe1000000 0x0 0x02400000>;
+		label = "cont_splash_region";
+	};
+
 	qseecom_ta_mem: qseecom_ta_region {
 		compatible = "shared-dma-pool";
 		alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;