msm: 8994: update to make use of new memory reservation bindings

Signed-off-by: Kumar Gala <galak@codeaurora.org>

2 files changed, 41 insertions, 43 deletions

diff --git a/arch/arm64/boot/dts/qcom/msm8994-ion.dtsi b/arch/arm64/boot/dts/qcom/msm8994-ion.dtsi
index 16b920e06910..eb0a8e706644 100644
--- a/arch/arm64/boot/dts/qcom/msm8994-ion.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994-ion.dtsi
@@ -30,33 +30,33 @@
 			compatible = "qcom,msm-ion-reserve";
 			reg = <8>;
 			qcom,heap-align = <0x1000>;
-			linux,contiguous-region = <&secure_mem>;
+			memory-region = <&secure_mem>;
 			qcom,ion-heap-type = "SECURE_DMA";
 			qcom,default-prefetch-size = <0x6c00000>;
 		};
 
 		qcom,ion-heap@22 { /* adsp heap */
 			reg = <22>;
-			linux,contiguous-region = <&adsp_mem>;
+			memory-region = <&adsp_mem>;
 			qcom,ion-heap-type = "DMA";
 		};
 
 		qcom,ion-heap@27 { /* QSECOM HEAP */
 			reg = <27>;
-			linux,contiguous-region = <&qsecom_mem>;
+			memory-region = <&qsecom_mem>;
 			qcom,ion-heap-type = "DMA";
 		};
 
 		qcom,ion-heap@28 { /* AUDIO HEAP */
 			reg = <28>;
-			linux,contiguous-region = <&audio_mem>;
+			memory-region = <&audio_mem>;
 			qcom,ion-heap-type = "DMA";
 		};
 
                adsp_venus_heap: qcom,ion-heap@23 {
 			compatible = "qcom,msm-ion-reserve";
 			reg = <23>;
-			linux,contiguous-region = <&peripheral_mem>;
+			memory-region = <&peripheral_mem>;
 			qcom,ion-heap-type = "DMA";
 		};
 	};
diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi
index 374d07e53408..df8c641e4094 100644
--- a/arch/arm64/boot/dts/qcom/msm8994.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi
@@ -148,57 +148,55 @@
 
 	soc: soc { };
 
-	memory {
+	reserved-memory {
 		#address-cells = <2>;
 		#size-cells = <2>;
+		ranges;
 
-		secure_mem: secure_region@0 {
-			linux,reserve-contiguous-region;
-			reg = <0 0 0 0xfc00000>;
-			label = "secure_mem";
+		secure_mem: secure_region {
+			compatible = "shared-dma-pool";
+			reusable;
+			alignment = <0 0x400000>;
+			size = <0 0xfc00000>;
 		};
 
-		adsp_mem: adsp_region@0 {
-                        linux,reserve-contiguous-region;
-			reg = <0 0 0 0x3F00000>;
-			label = "adsp_mem";
+		adsp_mem: adsp_region {
+			compatible = "shared-dma-pool";
+			reusable;
+			alignment = <0 0x400000>;
+			size = <0 0x4000000>;
 		};
 
-		qsecom_mem: qsecom_region@0 {
-                        linux,reserve-contiguous-region;
-			reg = <0 0 0 0x1100000>;
-			label = "qseecom_mem";
+		qsecom_mem: qsecom_region {
+			compatible = "shared-dma-pool";
+			reusable;
+			alignment = <0 0x400000>;
+			size = <0 0x1400000>;
 		};
 
-		audio_mem: audio_region@0 {
-                        linux,reserve-contiguous-region;
-			linux,reserve-region;
-			reg = <0 0 0 0x614000>;
-			label = "audio_mem";
+		audio_mem: audio_region {
+			compatible = "shared-dma-pool";
+			reusable;
+			alignment = <0 0x400000>;
+			size = <0 0x800000>;
 		};
 
-		removed_regions: removed_regions@0 {
-			linux,reserve-contiguous-region;
-			linux,reserve-region;
-			linux,remove-completely;
+		removed_regions: removed_regions@6300000 {
+			compatible = "removed-dma-pool";
+			no-map;
 			reg = <0 0x06300000 0 0xD00000>;
-			label = "memory_hole";
 		};
 
-		peripheral_mem: peripheral_region@0 {
-			linux,reserve-contiguous-region;
-			linux,reserve-region;
-			linux,remove-completely;
+		peripheral_mem: peripheral_region@c800000 {
+			compatible = "removed-dma-pool";
+			no-map;
 			reg = <0 0x0c800000 0 0x1b00000>;
-			label = "peripheral_mem";
 		};
 
-		modem_mem: modem_region@0 {
-			linux,reserve-contiguous-region;
-			linux,reserve-region;
-			linux,remove-completely;
+		modem_mem: modem_region@7000000 {
+			compatible = "removed-dma-pool";
+			no-map;
 			reg = <0 0x07000000 0 0x5800000>;
-			label = "modem_mem";
 		};
 	};
 };
@@ -1478,7 +1476,7 @@
 		qcom,pas-id = <9>;
 		qcom,proxy-timeout-ms = <5000>;
 		qcom,firmware-name = "venus";
-		linux,contiguous-region = <&peripheral_mem>;
+		contiguous-region = <&peripheral_mem>;
 	};
 
 	qcom,mss@fc880000 {
@@ -1522,7 +1520,7 @@
 		/* GPIO output to mss */
 		qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_1_out 0 0>;
 
-		linux,contiguous-region = <&modem_mem>;
+		contiguous-region = <&modem_mem>;
 	};
 
 	qcom,lpass@fe200000 {
@@ -1557,7 +1555,7 @@
 		/* GPIO output to lpass */
 		qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_2_out 0 0>;
 
-		linux,contiguous-region = <&peripheral_mem>;
+		contiguous-region = <&peripheral_mem>;
 	};
 
 	clock_rpm: qcom,rpmcc@fc401880 {
@@ -2664,13 +2662,13 @@
 	audio_heap {
 		compatible = "qcom,msm-shared-memory";
 		qcom,proc-id = <1>;
-		linux,contiguous-region = <&audio_mem>;
+		contiguous-region = <&audio_mem>;
 	};
 
 	adsp_heap {
 		compatible = "qcom,msm-shared-memory";
 		qcom,proc-id = <1>;
-		linux,contiguous-region = <&adsp_mem>;
+		contiguous-region = <&adsp_mem>;
 	};
 };