From 1d4ca57455e4e88f23aaf580107bd9592006dcef Mon Sep 17 00:00:00 2001
From: "Isaac J. Manjarres" <isaacm@quicinc.com>
Date: Wed, 4 Sep 2019 11:03:21 -0700
Subject: [PATCH] ARM: dts: msm: Use dt-bindings header for ION on Lahaina

Update the Lahaina ION DTSI file to include and use the
dt-bindings header with the ION heap IDs.

Change-Id: I1b7ebfbbc58c1fd7a59d2ceb81982da6c39bd228
---
 qcom/lahaina-ion.dtsi | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/qcom/lahaina-ion.dtsi b/qcom/lahaina-ion.dtsi
index f1cd57ba..a744420c 100644
--- a/qcom/lahaina-ion.dtsi
+++ b/qcom/lahaina-ion.dtsi
@@ -1,3 +1,5 @@
+#include <dt-bindings/arm/msm/msm_ion_ids.h>
+
 &soc {
 	qcom,ion {
 		compatible = "qcom,msm-ion";
@@ -5,24 +7,24 @@
 		#size-cells = <0>;
 
 		system_heap: qcom,ion-heap@25 {
-			reg = <25>;
+			reg = <ION_SYSTEM_HEAP_ID>;
 			qcom,ion-heap-type = "SYSTEM";
 		};
 
 		adsp_heap: qcom,ion-heap@22 {
-			reg = <22>;
+			reg = <ION_ADSP_HEAP_ID>;
 			memory-region = <&sdsp_mem>;
 			qcom,ion-heap-type = "DMA";
 		};
 
 		system_secure_heap: qcom,ion-heap@9 {
-			reg = <9>;
+			reg = <ION_SECURE_HEAP_ID>;
 			qcom,ion-heap-type = "SYSTEM_SECURE";
 		};
 
 		qcom,ion-heap@14 { /* SECURE CARVEOUT HEAP */
 			status = "disabled";
-			reg = <14>;
+			reg = <ION_SECURE_CARVEOUT_HEAP_ID>;
 			qcom,ion-heap-type = "SECURE_CARVEOUT";
 			cdsp {
 				memory-region = <&cdsp_secure_heap>;