Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2833c110 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 403fd6d4 499dad8a

arch/arm/boot/dts/qcom/mdmferrum.dtsi

+17 −0
Original line number Diff line number Diff line
@@ -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";

};

arch/arm/boot/dts/qcom/msm8909-ion.dtsi

+5 −5
Original line number Diff line number Diff line
@@ -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>;