Skip to contentSkip to conversation

Patch "ASoC: atmel_ssc_dai: Don't unconditionally reset SSC on stream startup" has been added to the 4.7-stable tree

PATCH [email protected] 1 participant 1 message Sep 9, 2016

Subsystems (5)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

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

to the 4.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
asoc-atmel_ssc_dai-don-t-unconditionally-reset-ssc-on-stream-startup.patch
and it can be found in the queue-4.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 3e103a65514c2947e53f3171b21255fbde8b60c6 Mon Sep 17 00:00:00 2001

From: Christoph Huber <[email protected]>
Date: Mon, 15 Aug 2016 18:59:25 +0200
Subject: ASoC: atmel_ssc_dai: Don't unconditionally reset SSC on stream startup

From: Christoph Huber <[email protected]>

commit 3e103a65514c2947e53f3171b21255fbde8b60c6 upstream.

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)

Fixes cbaadf0f90d6 (ASoC: atmel_ssc_dai: refactor the startup and shutdown)
---
 sound/soc/atmel/atmel_ssc_dai.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
sound/soc/atmel/atmel_ssc_dai.c +3 -2
@@ -299,8 +299,9 @@ static int atmel_ssc_startup(struct snd_
 	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;

Patches currently in stable-queue which might be from [email protected] are

queue-4.7/asoc-atmel_ssc_dai-don-t-unconditionally-reset-ssc-on-stream-startup.patch