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

Commit 98709553 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: Allow adsp heap to share the secure memory CMA pool"

parents bd103d78 e454457b

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

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 


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

			reg = <22>;

			linux,contiguous-region = <&adsp_mem>;

			linux,contiguous-region = <&secure_mem>;

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

		};

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

+1 −7
Original line number Diff line number Diff line
@@ -198,12 +198,6 @@ 
			label = "secure_mem";

		};



		adsp_mem: adsp_region@0 {

                        linux,reserve-contiguous-region;

			reg = <0 0 0 0x3F00000>;

			label = "adsp_mem";

		};



		qsecom_mem: qsecom_region@0 {

                        linux,reserve-contiguous-region;

			reg = <0 0 0 0x1800000>;
@@ -2968,7 +2962,7 @@ 
	adsp_heap {

		compatible = "qcom,msm-shared-memory";

		qcom,proc-id = <1>;

		linux,contiguous-region = <&adsp_mem>;

		linux,contiguous-region = <&secure_mem>;

	};



	qcom,msm-core {