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

Commit 8de21a0e 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: Add additional ion heaps for 8992"

parents ceaa7d1b 126c567a

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

+23 −0
Original line number Diff line number Diff line
@@ -20,5 +20,28 @@ 
			reg = <25>;

			qcom,ion-heap-type = "SYSTEM";

		};



		qcom,ion-heap@21 {

			reg = <21>;

			qcom,ion-heap-type = "SYSTEM_CONTIG";

		};



		qcom,ion-heap@22 { /* adsp heap */

			reg = <22>;

			linux,contiguous-region = <&adsp_mem>;

			qcom,ion-heap-type = "DMA";

		};



		qcom,ion-heap@27 { /* QSECOM HEAP */

			reg = <27>;

			linux,contiguous-region = <&qsecom_mem>;

			qcom,ion-heap-type = "DMA";

		};



		qcom,ion-heap@28 { /* AUDIO HEAP */

			reg = <28>;

			linux,contiguous-region = <&audio_mem>;

			qcom,ion-heap-type = "DMA";

		};

	};

};

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

+19 −0
Original line number Diff line number Diff line
@@ -132,6 +132,25 @@ 
		#address-cells = <2>;

		#size-cells = <2>;



		adsp_mem: adsp_region@0 {

                        linux,reserve-contiguous-region;

			reg = <0 0 0 0x300000>;

			label = "adsp_mem";

		};



		qsecom_mem: qsecom_region@0 {

                        linux,reserve-contiguous-region;

			reg = <0 0 0 0x300000>;

			label = "qseecom_mem";

		};



		audio_mem: audio_region@0 {

                        linux,reserve-contiguous-region;

			linux,reserve-region;

			reg = <0 0 0 0x400000>;

			label = "audio_mem";

		};



		removed_regions: removed_regions@0 {

			linux,reserve-contiguous-region;

			linux,reserve-region;