From 117cf1148a454dd866be4544859f7a3330171e62 Mon Sep 17 00:00:00 2001
From: "Isaac J. Manjarres" <isaacm@quicinc.com>
Date: Thu, 11 Jul 2019 11:54:17 -0700
Subject: [PATCH] ARM: dts: msm: Add initial ION heaps for Lahaina

Add the system, secure system, and secure carveout heaps for
Lahaina.

Change-Id: I3f029a27992db292dd9eb4cb7c4ccf431fbd57c4
---
 qcom/lahaina-ion.dtsi | 27 +++++++++++++++++++++++++++
 qcom/lahaina.dtsi     |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 qcom/lahaina-ion.dtsi

diff --git a/qcom/lahaina-ion.dtsi b/qcom/lahaina-ion.dtsi
new file mode 100644
index 00000000..a0ecefc3
--- /dev/null
+++ b/qcom/lahaina-ion.dtsi
@@ -0,0 +1,27 @@
+&soc {
+	qcom,ion {
+		compatible = "qcom,msm-ion";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		system_heap: qcom,ion-heap@25 {
+			reg = <25>;
+			qcom,ion-heap-type = "SYSTEM";
+		};
+
+		system_secure_heap: qcom,ion-heap@9 {
+			reg = <9>;
+			qcom,ion-heap-type = "SYSTEM_SECURE";
+		};
+
+		qcom,ion-heap@14 { /* SECURE CARVEOUT HEAP */
+			status = "disabled";
+			reg = <14>;
+			qcom,ion-heap-type = "SECURE_CARVEOUT";
+			cdsp {
+				memory-region = <&cdsp_secure_heap>;
+				token = <0x20000000>;
+			};
+		};
+	};
+};
diff --git a/qcom/lahaina.dtsi b/qcom/lahaina.dtsi
index cfaa0ece..ff489767 100644
--- a/qcom/lahaina.dtsi
+++ b/qcom/lahaina.dtsi
@@ -687,5 +687,6 @@
 
 #include "lahaina-pinctrl.dtsi"
 #include "lahaina-smp2p.dtsi"
+#include "lahaina-ion.dtsi"
 #include "msm-arm-smmu-lahaina.dtsi"
 #include "lahaina-usb.dtsi"