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

This commit is contained in:
qctecmdr 2021-06-10 10:39:28 -07:00 • committed by Gerrit - the friendly Code Review server
commit 4a2707f9f2
5 changed files with 20 additions and 13 deletions

View file

@ -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 {

View file

@ -7,3 +7,9 @@
&access_control_mem {
reg = <0x8fd80000 0x80000>;
};
&reserved_memory {
audio_heap_mem: audio_mem_region@8c000000 {
reg = <0x8c000000 0x400000>;
};
};

View file

@ -38,3 +38,8 @@
"msm-dai-q6-auxpcm.2";
};
};
&audio_co_heap {
status = "okay";
memory-region = <&audio_heap_mem>;
};

View file

@ -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 */

View file

@ -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>;