alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
To: Mark Brown <broonie@kernel.org>
Cc: Peter Meerwald-Stadler <p.meerwald@bct-electronic.com>,
	alsa-devel@alsa-project.org,
	Nicolas Ferre <nicolas.ferre@atmel.com>,
	Christoph Huber <c.huber@bct-electronic.com>,
	Songjun Wu <songjun.wu@microchip.com>
Subject: [PATCH v2] ASoC: atmel_ssc_dai: Don't unconditionally reset SSC on stream startup
Date: Mon, 15 Aug 2016 18:59:25 +0200	[thread overview]
Message-ID: <1471280365-23452-1-git-send-email-pmeerw@pmeerw.net> (raw)

From: Christoph Huber <c.huber@bct-electronic.com>

commit cbaadf0f90d6 ("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)

Signed-off-by: Christoph Huber <c.huber@bct-electronic.com>
Signed-off-by: Peter Meerwald-Stadler <p.meerwald@bct-electronic.com>
Cc: Songjun Wu <songjun.wu@microchip.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
---
v2 fixes formatting issues and rephrases the comment

 sound/soc/atmel/atmel_ssc_dai.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
index 54c09ac..16e459a 100644
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
@@ -299,8 +299,9 @@ static int atmel_ssc_startup(struct snd_pcm_substream *substream,
 	clk_enable(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 */
-	ssc_writel(ssc_p->ssc->regs, CR, SSC_BIT(CR_SWRST));
+	/* Reset the SSC unless initialized to keep it in a clean state */
+	if (!ssc_p->initialized)
+		ssc_writel(ssc_p->ssc->regs, CR, SSC_BIT(CR_SWRST));
 
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
 		dir = 0;
-- 
1.7.10.4

             reply	other threads:[~2016-08-15 16:59 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-15 16:59 Peter Meerwald-Stadler [this message]
2016-08-16 11:30 ` Applied "ASoC: atmel_ssc_dai: Don't unconditionally reset SSC on stream startup" to the asoc tree Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1471280365-23452-1-git-send-email-pmeerw@pmeerw.net \
    --to=pmeerw@pmeerw.net \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=c.huber@bct-electronic.com \
    --cc=nicolas.ferre@atmel.com \
    --cc=p.meerwald@bct-electronic.com \
    --cc=songjun.wu@microchip.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).