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

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

Merge "ARM: dts: msm: add CMA heap allocation"

parents 640a8784 e7f937c1

bindings/sound/qcom-audio-dev.txt

+10 −0
Original line number Diff line number Diff line
@@ -943,6 +943,16 @@ Example: 
		qcom,smmu-enabled;

	};



* msm-audio-ion-cma



Required properties:

 - compatible : "qcom,msm-audio-ion-cma"



Example:

	qcom,msm-audio-ion-cma {

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

	};



* msm-dai-tdm



[First Level Nodes]

qcom/lahaina-audio.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,10 @@ 
};



&audio_apr {

	msm_audio_ion_cma: qcom,msm-audio-ion-cma {

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

	};



	q6core: qcom,q6core-audio {

		compatible = "qcom,q6core-audio";

		#address-cells = <1>;

qcom/lahaina-ion.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -61,5 +61,11 @@ 
			qcom,ion-heap-type = "HYP_CMA";

		};



		qcom,ion-heap@5 { /* AUDIO ML HEAP */

			reg = <ION_AUDIO_ML_HEAP_ID>;

			memory-region = <&audio_cma_mem>;

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

		};



	};

};

qcom/lahaina.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -499,6 +499,14 @@ 
			size = <0x0 0x1000000>;

		};



		audio_cma_mem: audio_cma_region {

			compatible = "shared-dma-pool";

			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;

			reusable;

			alignment = <0x0 0x400000>;

			size = <0x0 0x1C00000>;

		};



		splash_memory:splash_region {

			reg = <0x0 0xe1000000 0x0 0x02300000>;

			label = "cont_splash_region";