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

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

Merge "ARM: dts: qcom: remove audio heap allocation for sdxnightjar"

parents 112e30be ddcd71f5

qcom/sdx-audio-lpass-elite.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ 


	qcom,msm-audio-ion {

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

		qcom,scm-mp-enabled;

		memory-region = <&audio_mem>;

	};



	pcm0: qcom,msm-pcm {

qcom/sdxnightjar-ion.dtsi

+0 −6
Original line number Diff line number Diff line
@@ -11,12 +11,6 @@ 
			qcom,ion-heap-type = "MSM_SYSTEM";

		};



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

			reg = <ION_AUDIO_HEAP_ID>;

			memory-region = <&audio_mem>;

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

		};



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

			reg = <ION_QSECOM_HEAP_ID>;

			memory-region = <&qseecom_mem>;

qcom/sdxnightjar.dtsi

+0 −6
Original line number Diff line number Diff line
@@ -68,12 +68,6 @@ 
			size = <0x400000>;

		};



		audio_mem: audio_region@0 {

			compatible = "shared-dma-pool";

			alloc-ranges = <0x00000000 0xffffffff>;

			reusable;

			size = <0x400000>;

		};

	};



	aliases { };