From 9f0d472d74efc7a2e71811ba7289deffa26a9544 Mon Sep 17 00:00:00 2001
From: "Isaac J. Manjarres" <isaacm@quicinc.com>
Date: Tue, 24 Mar 2020 15:51:50 -0700
Subject: [PATCH] ARM: dts: msm: Add support for ION for the trusted-VM

Add support for ION, and the trusted UI dynamic carveout
heap, for the trusted-VM.

Change-Id: I1816819a94e4bf38d991bec5bccfc0c8572f1e81
---
 qcom/trustedvm-ion.dtsi | 15 +++++++++++++++
 qcom/trustedvm.dtsi     |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 qcom/trustedvm-ion.dtsi

diff --git a/qcom/trustedvm-ion.dtsi b/qcom/trustedvm-ion.dtsi
new file mode 100644
index 00000000..917f7f01
--- /dev/null
+++ b/qcom/trustedvm-ion.dtsi
@@ -0,0 +1,15 @@
+#include <dt-bindings/arm/msm/msm_ion_ids.h>
+
+/ {
+	qcom,ion {
+		compatible = "qcom,msm-ion";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		tui_heap: qcom,ion-heap-tui { /* TRUSTED UI CARVEOUT HEAP */
+			reg = <ION_TUI_CARVEOUT_HEAP_ID>;
+			qcom,dynamic-heap;
+			qcom,ion-heap-type = "CARVEOUT";
+		};
+	};
+};
diff --git a/qcom/trustedvm.dtsi b/qcom/trustedvm.dtsi
index 770e29a4..474ab4c5 100644
--- a/qcom/trustedvm.dtsi
+++ b/qcom/trustedvm.dtsi
@@ -91,3 +91,5 @@
 			     <GIC_PPI 12 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>;
 	};
 };
+
+#include "trustedvm-ion.dtsi"