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

Commit 4a2707f9 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Remove the audio ION CMA heap for sdxlemur"

parents 74d0ce73 4fc73ce5

qcom/sdx-audio-lpass.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
	qcom,msm-audio-ion {

		compatible = "qcom,msm-audio-ion-cma";

		qcom,scm-mp-enabled;

		memory-region = <&audio_mem>;

		memory-region = <&audio_heap_mem>;

	};



	pcm0: qcom,msm-pcm {

qcom/sdxlemur-1024mb.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -7,3 +7,9 @@ 
&access_control_mem {

	reg = <0x8fd80000 0x80000>;

};



&reserved_memory {

	audio_heap_mem: audio_mem_region@8c000000 {

		reg = <0x8c000000 0x400000>;

	};

};

qcom/sdxlemur-audio.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -38,3 +38,8 @@ 
				"msm-dai-q6-auxpcm.2";

	};

};



&audio_co_heap {

	status = "okay";

	memory-region = <&audio_heap_mem>;

};

qcom/sdxlemur-ion.dtsi

+8 −4
Original line number Diff line number Diff line
@@ -11,10 +11,14 @@ 
			qcom,ion-heap-type = "MSM_SYSTEM";

		};



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

			reg = <ION_AUDIO_HEAP_ID>;

			memory-region = <&audio_mem>;

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

		audio_co_heap: qcom,ion-heap@17 { /* AUDIO CARVEOUT HEAP */

			reg = <ION_AUDIO_CARVEOUT_HEAP_ID>;

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

			/*

			 * memory-region must be specified when enabled here or

			 * when the node is overridden to be enabled elsewhere.

			 */

			status = "disabled";

		};



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

qcom/sdxlemur.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -69,14 +69,6 @@ 
			size = <0x400000>;

		};





		audio_mem: audio_region@0 {

			compatible = "shared-dma-pool";

			alloc-ranges = <0x00000000 0xffffffff>;

			reusable;

			size = <0x400000>;

		};



		llcc_tcm_mem: llcc_tcm_region {

			no-map;

			reg = <0x15800000 0x800000>;