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

Commit 5f738518 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: Enable MM and increase QSEECOM heap size"

parents 2aeed53e 0406e9ab

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

+9 −0
Original line number Diff line number Diff line
@@ -26,6 +26,15 @@ 
			qcom,ion-heap-type = "SYSTEM_CONTIG";

		};



		qcom,ion-heap@8 { /* CP_MM HEAP */

			compatible = "qcom,msm-ion-reserve";

			reg = <8>;

			qcom,heap-align = <0x1000>;

			linux,contiguous-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>;

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

+8 −2
Original line number Diff line number Diff line
@@ -144,6 +144,12 @@ 
		#address-cells = <2>;

		#size-cells = <2>;



		secure_mem: secure_region@0 {

			linux,reserve-contiguous-region;

			reg = <0 0 0 0x12c00000>;

			label = "secure_mem";

		};



		adsp_mem: adsp_region@0 {

                        linux,reserve-contiguous-region;

			reg = <0 0 0 0x300000>;
@@ -152,7 +158,7 @@ 


		qsecom_mem: qsecom_region@0 {

			linux,reserve-contiguous-region;

			reg = <0 0 0 0x300000>;

			reg = <0 0 0 0x1800000>;

			label = "qseecom_mem";

		};