| Message ID | 1433492346-29506-3-git-send-email-arnaud.pouliquen@st.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e22579713ae1384a3dff545369cebe42b01370fa |
| Headers | show |
On Fri, Jun 05, 2015 at 10:19:06AM +0200, Arnaud Pouliquen wrote: > Allows to request a specific mclk frequency per cpu_dai. > To support some codecs with mclk provided by the cpu_dai, the > mclk rate must be set depending on frame rate. I'm going to hold off on this one till after the merge window since we are very near to that I worry that the behaviour change for CPU DAIs may trigger problems, I'd appreciate test reports from other users.
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index d555493..3ff76d4 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -76,6 +76,7 @@ static int asoc_simple_card_hw_params(struct snd_pcm_substream *substream, { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_dai *codec_dai = rtd->codec_dai; + struct snd_soc_dai *cpu_dai = rtd->cpu_dai; struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card); struct simple_dai_props *dai_props = &priv->dai_props[rtd - rtd->card->rtd]; @@ -91,8 +92,16 @@ static int asoc_simple_card_hw_params(struct snd_pcm_substream *substream, mclk = params_rate(params) * mclk_fs; ret = snd_soc_dai_set_sysclk(codec_dai, 0, mclk, SND_SOC_CLOCK_IN); + if (ret && ret != -ENOTSUPP) + goto err; + + ret = snd_soc_dai_set_sysclk(cpu_dai, 0, mclk, + SND_SOC_CLOCK_OUT); + if (ret && ret != -ENOTSUPP) + goto err; } +err: return ret; }
Allows to request a specific mclk frequency per cpu_dai. To support some codecs with mclk provided by the cpu_dai, the mclk rate must be set depending on frame rate. Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@st.com> --- sound/soc/generic/simple-card.c | 9 +++++++++ 1 file changed, 9 insertions(+)