shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 20:32:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: es8328: Move clock setup to hw_params

Browse Source 
This ensures that the clock is setup after its frequency has been set;
the existing code in set_dai_fmt may be called before the clock rate has
been set resulting in an incorrect configuration.

Signed-off-by: John Keeping <john@metanate.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
John Keeping
2016-05-09 12:24:29 +01:00
committed by Mark Brown
parent f55532a0c0
commit 420c470d6b
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sound/soc/codecs/es8328.c
View File

@@ -445,9 +445,10 @@ static int es8328_hw_params(struct snd_pcm_substream *substream,
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_codec *codec = dai->codec;
struct es8328_priv *es8328 = snd_soc_codec_get_drvdata(codec); struct es8328_priv *es8328 = snd_soc_codec_get_drvdata(codec);
int clk_rate; int clk_rate = clk_get_rate(es8328->clk);
int i; int i;
int reg; int reg;
int val;
u8 ratio; u8 ratio;
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
@@ -455,16 +456,24 @@ static int es8328_hw_params(struct snd_pcm_substream *substream,
else else
reg = ES8328_ADCCONTROL5; reg = ES8328_ADCCONTROL5;
clk_rate = clk_get_rate(es8328->clk); switch (clk_rate) {
case ES8328_SYSCLK_RATE_1X:
if ((clk_rate != ES8328_SYSCLK_RATE_1X) && val = 0;
(clk_rate != ES8328_SYSCLK_RATE_2X)) { break;
case ES8328_SYSCLK_RATE_2X:
val = ES8328_MASTERMODE_MCLKDIV2;
break;
default:
dev_err(codec->dev, dev_err(codec->dev,
"%s: clock is running at %d Hz, not %d or %d Hz\n", "%s: clock is running at %d Hz, not %d or %d Hz\n",
__func__, clk_rate, __func__, clk_rate,
ES8328_SYSCLK_RATE_1X, ES8328_SYSCLK_RATE_2X); ES8328_SYSCLK_RATE_1X, ES8328_SYSCLK_RATE_2X);
return -EINVAL; return -EINVAL;
} }
ret = snd_soc_update_bits(codec, ES8328_MASTERMODE,
ES8328_MASTERMODE_MCLKDIV2, val);
if (ret < 0)
return ret;
/* find master mode MCLK to sampling frequency ratio */ /* find master mode MCLK to sampling frequency ratio */
ratio = mclk_ratios[0].rate; ratio = mclk_ratios[0].rate;
@@ -484,8 +493,6 @@ static int es8328_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int fmt) unsigned int fmt)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
struct es8328_priv *es8328 = snd_soc_codec_get_drvdata(codec);
int clk_rate;
u8 mode = ES8328_DACCONTROL1_DACWL_16; u8 mode = ES8328_DACCONTROL1_DACWL_16;
/* set master/slave audio interface */ /* set master/slave audio interface */
@@ -515,14 +522,8 @@ static int es8328_set_dai_fmt(struct snd_soc_dai *codec_dai,
snd_soc_write(codec, ES8328_ADCCONTROL4, mode); snd_soc_write(codec, ES8328_ADCCONTROL4, mode);
/* Master serial port mode, with BCLK generated automatically */ /* Master serial port mode, with BCLK generated automatically */
clk_rate = clk_get_rate(es8328->clk); snd_soc_update_bits(codec, ES8328_MASTERMODE,
if (clk_rate == ES8328_SYSCLK_RATE_1X) ES8328_MASTERMODE_MSC, ES8328_MASTERMODE_MSC);
snd_soc_write(codec, ES8328_MASTERMODE,
ES8328_MASTERMODE_MSC);
else
snd_soc_write(codec, ES8328_MASTERMODE,
ES8328_MASTERMODE_MCLKDIV2 |
ES8328_MASTERMODE_MSC);
return 0; return 0;
} }