diff --git a/qcom/neo-dma-heaps.dtsi b/qcom/neo-dma-heaps.dtsi
index a08f9c5c..16e0cb28 100644
--- a/qcom/neo-dma-heaps.dtsi
+++ b/qcom/neo-dma-heaps.dtsi
@@ -4,52 +4,52 @@
 	qcom,dma-heaps {
 		compatible = "qcom,dma-heaps";
 
-		qcom,lsr_lefteye {
+		lsr_lefteye_dma_buf: qcom,lsr_lefteye {
 			qcom,dma-heap-name = "qcom,lsr_lefteye";
 			qcom,dma-heap-type = <HEAP_TYPE_CARVEOUT>;
 			memory-region = <&lsr_lefteye_mem_heap>;
 		};
 
-		qcom,lsr_righteye {
+		lsr_righteye_dma_buf: qcom,lsr_righteye {
 			qcom,dma-heap-name = "qcom,lsr_righteye";
 			qcom,dma-heap-type = <HEAP_TYPE_CARVEOUT>;
 			memory-region = <&lsr_righteye_mem_heap>;
 		};
 
-		qcom,lsr_depth {
+		lsr_depth_dma_buf: qcom,lsr_depth {
 			qcom,dma-heap-name = "qcom,lsr_depth";
 			qcom,dma-heap-type = <HEAP_TYPE_CARVEOUT>;
 			memory-region = <&lsr_depth_mem_heap>;
 		};
 
-		qcom,lsr_misc {
+		lsr_misc_dma_buf: qcom,lsr_misc {
 			qcom,dma-heap-name = "qcom,lsr_misc";
 			qcom,dma-heap-type = <HEAP_TYPE_CARVEOUT>;
 			memory-region = <&lsr_misc_mem_heap>;
 		};
 
-		qcom,secure_lsr_lefteye {
+		secure_lsr_lefteye_dma_buf: qcom,secure_lsr_lefteye {
 			qcom,dma-heap-name = "qcom,secure_lsr_lefteye";
 			qcom,dma-heap-type = <HEAP_TYPE_SECURE_CARVEOUT>;
 			memory-region = <&secure_lsr_lefteye_mem_heap>;
 			qcom,token = <0x80000>;
 		};
 
-		qcom,secure_lsr_righteye {
+		secure_lsr_righteye_dma_buf: qcom,secure_lsr_righteye {
 			qcom,dma-heap-name = "qcom,secure_lsr_righteye";
 			qcom,dma-heap-type = <HEAP_TYPE_SECURE_CARVEOUT>;
 			memory-region = <&secure_lsr_righteye_mem_heap>;
 			qcom,token = <0x80000>;
 		};
 
-		qcom,secure_lsr_depth {
+		secure_lsr_depth_dma_buf: qcom,secure_lsr_depth {
 			qcom,dma-heap-name = "qcom,secure_lsr_depth";
 			qcom,dma-heap-type = <HEAP_TYPE_SECURE_CARVEOUT>;
 			memory-region = <&secure_lsr_depth_mem_heap>;
 			qcom,token = <0x80000>;
 		};
 
-		qcom,secure_lsr_misc {
+		secure_lsr_misc_dma_buf: qcom,secure_lsr_misc {
 			qcom,dma-heap-name = "qcom,secure_lsr_misc";
 			qcom,dma-heap-type = <HEAP_TYPE_SECURE_CARVEOUT>;
 			memory-region = <&secure_lsr_misc_mem_heap>;
diff --git a/qcom/neo_la.dtsi b/qcom/neo_la.dtsi
index 9a4cb9cb..312a1fac 100644
--- a/qcom/neo_la.dtsi
+++ b/qcom/neo_la.dtsi
@@ -125,6 +125,70 @@
 	};
 };
 
+&lsr_lefteye_dma_buf {
+	status = "disabled";
+};
+
+&lsr_righteye_dma_buf {
+	status = "disabled";
+};
+
+&lsr_depth_dma_buf {
+	status = "disabled";
+};
+
+&lsr_misc_dma_buf {
+	status = "disabled";
+};
+
+&secure_lsr_lefteye_dma_buf {
+	status = "disabled";
+};
+
+&secure_lsr_righteye_dma_buf {
+	status = "disabled";
+};
+
+&secure_lsr_depth_dma_buf {
+	status = "disabled";
+};
+
+&secure_lsr_misc_dma_buf {
+	status = "disabled";
+};
+
+&lsr_lefteye_mem_heap {
+	status = "disabled";
+};
+
+&lsr_righteye_mem_heap {
+	status = "disabled";
+};
+
+&lsr_depth_mem_heap {
+	status = "disabled";
+};
+
+&lsr_misc_mem_heap {
+	status = "disabled";
+};
+
+&secure_lsr_lefteye_mem_heap {
+	status = "disabled";
+};
+
+&secure_lsr_righteye_mem_heap {
+	status = "disabled";
+};
+
+&secure_lsr_depth_mem_heap {
+	status = "disabled";
+};
+
+&secure_lsr_misc_mem_heap {
+	status = "disabled";
+};
+
 &pcie0 {
 	status = "ok";
 };