diff options
author | Takashi Iwai <tiwai@suse.de> | 2021-05-25 09:58:01 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2021-05-25 09:58:01 +0300 |
commit | dad19afce9ad93dda1a10d08afea71b6dd30f19f (patch) | |
tree | 30e4532c8341fbf89680813d2ec2e888ef99bd85 /sound/soc/amd/raven/acp3x-pcm-dma.c | |
parent | 2b899f31f1a6db2db4608bac2ac04fe2c4ad89eb (diff) | |
parent | af2702549d68519ac78228e915d9b2c199056787 (diff) | |
download | linux-dad19afce9ad93dda1a10d08afea71b6dd30f19f.tar.xz |
Merge tag 'asoc-fix-v5.13-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.13
A collection of fixes that have come in since the merge window, mainly
device specific things. The fixes to the generic cards from
Morimoto-san are handling regressions that were introduced in the merge
window on at least the Kontron sl28-var3-ads2.
Diffstat (limited to 'sound/soc/amd/raven/acp3x-pcm-dma.c')
-rw-r--r-- | sound/soc/amd/raven/acp3x-pcm-dma.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index f22bb2bdf527..8148b0d22e88 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -235,10 +235,6 @@ static int acp3x_dma_open(struct snd_soc_component *component, return ret; } - if (!adata->play_stream && !adata->capture_stream && - !adata->i2ssp_play_stream && !adata->i2ssp_capture_stream) - rv_writel(1, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); - i2s_data->acp3x_base = adata->acp3x_base; runtime->private_data = i2s_data; return ret; @@ -365,12 +361,6 @@ static int acp3x_dma_close(struct snd_soc_component *component, } } - /* Disable ACP irq, when the current stream is being closed and - * another stream is also not active. - */ - if (!adata->play_stream && !adata->capture_stream && - !adata->i2ssp_play_stream && !adata->i2ssp_capture_stream) - rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); return 0; } |