Commit 3e103a65 authored by Christoph Huber's avatar Christoph Huber Committed by Mark Brown

ASoC: atmel_ssc_dai: Don't unconditionally reset SSC on stream startup

commit cbaadf0f ("ASoC: atmel_ssc_dai: refactor the startup and
shutdown") refactored code such that the SSC is reset on every
startup; this breaks duplex audio (e.g. first start audio playback,
then start record, causing the playback to stop/hang)

Fixes: cbaadf0f (ASoC: atmel_ssc_dai: refactor the startup and shutdown)
Signed-off-by: default avatarChristoph Huber <c.huber@bct-electronic.com>
Signed-off-by: default avatarPeter Meerwald-Stadler <p.meerwald@bct-electronic.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
parent 29b4817d
...@@ -299,8 +299,9 @@ static int atmel_ssc_startup(struct snd_pcm_substream *substream, ...@@ -299,8 +299,9 @@ static int atmel_ssc_startup(struct snd_pcm_substream *substream,
clk_enable(ssc_p->ssc->clk); clk_enable(ssc_p->ssc->clk);
ssc_p->mck_rate = clk_get_rate(ssc_p->ssc->clk); ssc_p->mck_rate = clk_get_rate(ssc_p->ssc->clk);
/* Reset the SSC to keep it at a clean status */ /* Reset the SSC unless initialized to keep it in a clean state */
ssc_writel(ssc_p->ssc->regs, CR, SSC_BIT(CR_SWRST)); if (!ssc_p->initialized)
ssc_writel(ssc_p->ssc->regs, CR, SSC_BIT(CR_SWRST));
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
dir = 0; dir = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment