From 4fc73ce5c56ceed3ef49fc5ebaecc349e9328b02 Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Fri, 7 May 2021 10:09:46 -0700 Subject: [PATCH] ARM: dts: msm: Remove the audio ION CMA heap for sdxlemur Remove the audio ION CMA heap, along with its associated memory region, and the audio device node, as they are no longer in use. Change-Id: Ifa5730b8fd6a3f2ceeea82bee8aec153f82d60e1 --- qcom/sdx-audio-lpass.dtsi | 6 ------ qcom/sdxlemur-ion.dtsi | 6 ------ qcom/sdxlemur.dtsi | 8 -------- 3 files changed, 20 deletions(-) diff --git a/qcom/sdx-audio-lpass.dtsi b/qcom/sdx-audio-lpass.dtsi index 0cf809dc3c8f..fdbf5d95c4e0 100644 --- a/qcom/sdx-audio-lpass.dtsi +++ b/qcom/sdx-audio-lpass.dtsi @@ -14,12 +14,6 @@ }; qcom,msm-audio-ion { - compatible = "qcom,msm-audio-ion-cma"; - qcom,scm-mp-enabled; - memory-region = <&audio_mem>; - }; - - qcom,msm-audio-ion-co { compatible = "qcom,msm-audio-ion-cma"; qcom,scm-mp-enabled; memory-region = <&audio_heap_mem>; diff --git a/qcom/sdxlemur-ion.dtsi b/qcom/sdxlemur-ion.dtsi index 8fb6e0abb786..ae1ce3979e3f 100644 --- a/qcom/sdxlemur-ion.dtsi +++ b/qcom/sdxlemur-ion.dtsi @@ -11,12 +11,6 @@ qcom,ion-heap-type = "MSM_SYSTEM"; }; - qcom,ion-heap@8 { /* AUDIO HEAP */ - reg = ; - memory-region = <&audio_mem>; - qcom,ion-heap-type = "DMA"; - }; - audio_co_heap: qcom,ion-heap@17 { /* AUDIO CARVEOUT HEAP */ reg = ; qcom,ion-heap-type = "MSM_CARVEOUT"; diff --git a/qcom/sdxlemur.dtsi b/qcom/sdxlemur.dtsi index b111a051ee4d..a130619ee521 100644 --- a/qcom/sdxlemur.dtsi +++ b/qcom/sdxlemur.dtsi @@ -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>;