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

Commit 6facd2d1 authored by Simon Trimmer's avatar Simon Trimmer Committed by Mark Brown
Browse files

ASoC: wm_adsp: Disable DMAs before clearing the transfer length 



This patch reorders the clearing of the DMA masks to avoid potential
artefacts being introduced.

Signed-off-by: default avatarSimon Trimmer <simont@opensource.wolfsonmicro.com>
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 28ee3d73

sound/soc/codecs/wm_adsp.c

+5 −3
Original line number Diff line number Diff line
@@ -2366,13 +2366,15 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w, 
		dsp->running = false;



		regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,

				   ADSP2_SYS_ENA | ADSP2_CORE_ENA |

				   ADSP2_START, 0);

				   ADSP2_CORE_ENA | ADSP2_START, 0);



		/* Make sure DMAs are quiesced */

		regmap_write(dsp->regmap, dsp->base + ADSP2_RDMA_CONFIG_1, 0);

		regmap_write(dsp->regmap, dsp->base + ADSP2_WDMA_CONFIG_1, 0);

		regmap_write(dsp->regmap, dsp->base + ADSP2_WDMA_CONFIG_2, 0);

		regmap_write(dsp->regmap, dsp->base + ADSP2_RDMA_CONFIG_1, 0);



		regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,

				   ADSP2_SYS_ENA, 0);



		list_for_each_entry(ctl, &dsp->ctl_list, list)

			ctl->enabled = 0;