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

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

Merge "ARM: dts: msm: Add support of cma heap"

parents 2c4ef1b3 ce7280c0

qcom/shima-audio.dtsi

+8 −2
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>;
@@ -47,8 +51,10 @@ 
						   <0x00000000>, <0x00000000>,

						   <0x00000006>;



			clock-names = "lpass_core_hw_vote";

			clocks = <&lpass_core_hw_vote 0>;

			clock-names = "lpass_core_hw_vote",

					"lpass_audio_hw_vote";

			clocks = <&lpass_core_hw_vote 0>,

					<&lpass_audio_hw_vote 0>;

		};



		bolero: bolero-cdc {

qcom/shima-ion.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -39,5 +39,10 @@ 
			memory-region = <&qseecom_mem>;

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

		};

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

			reg = <ION_AUDIO_ML_HEAP_ID>;

			memory-region = <&audio_cma_mem>;

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

		};

	};

};

qcom/shima.dtsi

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

		};



		audio_cma_mem: audio_cma_region {

			compatible = "shared-dma-pool";

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

			reusable;

			alignment = <0x0 0x400000>;

			size = <0x0 0x1C00000>;

		};



	};



	chosen {