lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: fsi: fsi_set_master_clk() was called from fsi_hw_xxx() only

Browse Source 
Current FSI driver is using fsi_set_master_clk() if it needs system clock.
But this function was called from
fsi_hw_shutdown()/fsi_dai_trigger()/fsi_resume() without a sense of unity.
Because of this, sound playback after suspend failed sometimes.
To keep consistency, fsi_master_clk() was called from
fsi_hw_start/stop() only now.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Kuninori Morimoto
2012-10-29 00:37:22 -07:00
committed by Mark Brown
parent 1ddd82868c
commit ddeb2d701b
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sound/soc/sh/fsi.c
View File

@@ -1333,12 +1333,17 @@ static int fsi_hw_startup(struct fsi_priv *fsi,
/* fifo init */ /* fifo init */
fsi_fifo_init(fsi, io, dev); fsi_fifo_init(fsi, io, dev);
/* start master clock */
if (fsi_is_clk_master(fsi))
fsi_set_master_clk(dev, fsi, fsi->rate, 1);
return 0; return 0;
} }
static void fsi_hw_shutdown(struct fsi_priv *fsi, static void fsi_hw_shutdown(struct fsi_priv *fsi,
struct device *dev) struct device *dev)
{ {
/* stop master clock */
if (fsi_is_clk_master(fsi)) if (fsi_is_clk_master(fsi))
fsi_set_master_clk(dev, fsi, fsi->rate, 0); fsi_set_master_clk(dev, fsi, fsi->rate, 0);
} }
@@ -1461,19 +1466,11 @@ static int fsi_dai_hw_params(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
struct fsi_priv *fsi = fsi_get_priv(substream); struct fsi_priv *fsi = fsi_get_priv(substream);
long rate = params_rate(params);
int ret;
if (!fsi_is_clk_master(fsi)) if (fsi_is_clk_master(fsi))
fsi->rate = params_rate(params);
return 0; return 0;
ret = fsi_set_master_clk(dai->dev, fsi, rate, 1);
if (ret < 0)
return ret;
fsi->rate = rate;
return ret;
} }
static const struct snd_soc_dai_ops fsi_dai_ops = { static const struct snd_soc_dai_ops fsi_dai_ops = {
@@ -1770,10 +1767,6 @@ static void __fsi_resume(struct fsi_priv *fsi,
return; return;
fsi_hw_startup(fsi, io, dev); fsi_hw_startup(fsi, io, dev);
if (fsi_is_clk_master(fsi) && fsi->rate)
fsi_set_master_clk(dev, fsi, fsi->rate, 1);
fsi_stream_start(fsi, io); fsi_stream_start(fsi, io);
} }