From 88b59f6ab5be4bef80848e6a06cd0b2a5879c818 Mon Sep 17 00:00:00 2001
From: Rajeshwar Kurapaty <rkurapat@qti.qualcomm.com>
Date: Tue, 19 May 2020 21:37:51 +0530
Subject: [PATCH] ARM: dts: msm: Add secure display heap configuration for
 Shima

Add secure display heap configuration to enable secure memory
allocations for secure display/camera usecases.

Change-Id: Ida23c7b5eff4ab6c0e2f905148ac8147ce600d3b
---
 qcom/shima-ion.dtsi | 5 +++++
 qcom/shima.dtsi     | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/qcom/shima-ion.dtsi b/qcom/shima-ion.dtsi
index 0a1bc129fe87..492860866012 100644
--- a/qcom/shima-ion.dtsi
+++ b/qcom/shima-ion.dtsi
@@ -16,5 +16,10 @@
 			qcom,ion-heap-type = "SYSTEM_SECURE";
 		};
 
+		qcom,ion-heap@10 { /* SECURE DISPLAY HEAP */
+			reg = <10>;
+			memory-region = <&secure_display_memory>;
+			qcom,ion-heap-type = "HYP_CMA";
+		};
 	};
 };
diff --git a/qcom/shima.dtsi b/qcom/shima.dtsi
index 9cb471e8bec1..56cf4a5394a4 100644
--- a/qcom/shima.dtsi
+++ b/qcom/shima.dtsi
@@ -302,6 +302,14 @@
 			reg = <0x0 0xd0000000 0x0 0xa600000>;
 		};
 
+		secure_display_memory: secure_display_region {
+			compatible = "shared-dma-pool";
+			alloc-ranges = <0 0x00000000 0 0xffffffff>;
+			reusable;
+			alignment = <0 0x400000>;
+			size = <0 0xA000000>;
+		};
+
 		/* global autoconfigured region for contiguous allocations */
 		linux,cma {
 			compatible = "shared-dma-pool";