Merge "ARM: dts: msm: Update memory layout and disable ION heap for M…

…DMFerrum"
msm8916-mainline · Oct 8, 2014 · 2833c11 · 2833c11
2 parents 403fd6d + 499dad8
commit 2833c11
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/arch/arm/boot/dts/qcom/mdmferrum.dtsi b/arch/arm/boot/dts/qcom/mdmferrum.dtsi
@@ -25,3 +25,20 @@
 &pm8909_adc_tm {
 	/delete-node/ chan@30;
 };
+
+&external_image_mem {
+	reg = <0x0 0x87c00000 0x0 0x0400000>;
+};
+
+&venus_qseecom_mem {
+	status = "disabled";
+};
+
+&system_contig_heap {
+	status = "disabled";
+};
+
+&qsecom_heap {
+	status = "disabled";
+};
+
diff --git a/arch/arm/boot/dts/qcom/msm8909-ion.dtsi b/arch/arm/boot/dts/qcom/msm8909-ion.dtsi
@@ -16,31 +16,31 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		qcom,ion-heap@25 {
+		system_heap: qcom,ion-heap@25 {
 			reg = <25>;
 			qcom,ion-heap-type = "SYSTEM";
 		};
 
-		qcom,ion-heap@21 {
+		system_contig_heap: qcom,ion-heap@21 {
 			reg = <21>;
 			qcom,ion-heap-type = "SYSTEM_CONTIG";
 		};
 
-		qcom,ion-heap@27 { /* QSEECOM HEAP */
+		qsecom_heap: qcom,ion-heap@27 { /* QSEECOM HEAP */
 			compatible = "qcom,msm-ion-reserve";
 			reg = <27>;
 			linux,contiguous-region = <&venus_qseecom_mem>;
 			qcom,ion-heap-type = "DMA";
 		};
 
-		qcom,ion-heap@28 { /* AUDIO HEAP */
+		audio_heap: qcom,ion-heap@28 { /* AUDIO HEAP */
                         compatible = "qcom,msm-ion-reserve";
                         reg = <28>;
                         linux,contiguous-region = <&audio_mem>;
                         qcom,ion-heap-type = "DMA";
 		};
 
-		qcom,ion-heap@26 { /* MODEM HEAP */
+		modem_heap: qcom,ion-heap@26 { /* MODEM HEAP */
 			compatible = "qcom,msm-ion-reserve";
 			reg = <26>;
 			linux,contiguous-region = <&modem_adsp_mem>;