diff mbox

[alsa-devel] ASoC: SAMSUNG: Don't clear clock setting during i2s_startup

Message ID 1398240264-21285-1-git-send-email-tushar.behera@linaro.org
State Accepted
Commit d66eac3e2b09690e28f9ac405969d6857325ee9d
Headers show

Commit Message

Tushar Behera April 23, 2014, 8:04 a.m. UTC
In exiting kernel, if DAIFMT flags are set in dai_link and I2S is
set to run in master mode, the I2S clocks are not getting configured
resulting in no output.

Existing code clears the current I2S clock settings during i2s_startup
and requires that the clocks are reconfigured. It then assumes that
sound-card driver would call snd_soc_dai_{set_sysclk/set_fmt} to
configure the root clock.

1. Since I2S clock settings remain fixed for a board, it would be better
to set the clocks once during sound-card probe.

2. Also if the DAIFMT flags are set in dai_link, snd_soc_dai_set_fmt is
called during DAI probe.

If both these conditions are true, then I2S clock remains unconfigured
during audio playback. Fix this by removing the code to clear
rclk_srcrate in i2s_startup. Instead, reset this during DAI probe.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
---
The patch is based on v3.15-rc2.

 sound/soc/samsung/i2s.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Mark Brown April 23, 2014, 11:30 a.m. UTC | #1
On Wed, Apr 23, 2014 at 01:34:24PM +0530, Tushar Behera wrote:
> In exiting kernel, if DAIFMT flags are set in dai_link and I2S is
> set to run in master mode, the I2S clocks are not getting configured
> resulting in no output.

Applied, thanks.
diff mbox

Patch

diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 048ead9..6e61db7 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -724,9 +724,6 @@  static int i2s_startup(struct snd_pcm_substream *substream,
 	else
 		i2s->mode |= DAI_MANAGER;
 
-	/* Enforce set_sysclk in Master mode */
-	i2s->rclk_srcrate = 0;
-
 	if (!any_active(i2s) && (i2s->quirks & QUIRK_NEED_RSTCLR))
 		writel(CON_RSTCLR, i2s->addr + I2SCON);
 
@@ -984,6 +981,7 @@  probe_exit:
 	/* Reset any constraint on RFS and BFS */
 	i2s->rfs = 0;
 	i2s->bfs = 0;
+	i2s->rclk_srcrate = 0;
 	i2s_txctrl(i2s, 0);
 	i2s_rxctrl(i2s, 0);
 	i2s_fifo(i2s, FIC_TXFLUSH);