ASoC: wm8904: configure sysclk/FLL automatically
Subsystems (3)
PATCH 1/1 ASoC: wm8904: configure sysclk/FLL automatically
This adds a new mode WM8904_CLK_AUTO which automatically enables the FLL if a frequency different than the MCLK is set.
These additions make the codec work with the simple-card driver in general and especially in systems where the MCLK doesn't match the requested clock.
---
Unfortunately, I had to move wm8904_sys_sysclk() below wm8904_set_fll(). So that makes this patch a bit ugly. The added part is the WM8904_CLK_AUTO branch.
sound/soc/codecs/wm8904.c | 72 ++++++++++++++++++++++++--------------- sound/soc/codecs/wm8904.h | 1 + 2 files changed, 45 insertions(+), 28 deletions(-)
sound/soc/codecs/wm8904.c +44 -28
@@ -1410,34 +1410,6 @@ static int wm8904_hw_params(struct snd_pcm_substream *substream,return 0 ; } - -static int wm8904_set_sysclk (struct snd_soc_dai *dai,int clk_id, -unsigned int freq,int dir) -{ -struct snd_soc_component *component = dai->component; -struct wm8904_priv *priv =snd_soc_component_get_drvdata (component); - -switch (clk_id) { -case WM8904_CLK_MCLK : - priv->sysclk_src = clk_id; - priv->mclk_rate = freq; -break ; - -case WM8904_CLK_FLL : - priv->sysclk_src = clk_id; -break ; - -default : -return -EINVAL ; - } - -dev_dbg (dai->dev,"Clock source is %d at %uHz\n" , clk_id, freq); - -wm8904_configure_clocking (component); - -return 0 ; -} -static int wm8904_set_fmt (struct snd_soc_dai *dai,unsigned int fmt) {struct snd_soc_component *component = dai->component;
@@ -1824,6 +1796,50 @@ static int wm8904_set_fll(struct snd_soc_dai *dai, int fll_id, int source,return 0 ; } +static int wm8904_set_sysclk (struct snd_soc_dai *dai,int clk_id, +unsigned int freq,int dir) +{ +struct snd_soc_component *component = dai->component; +struct wm8904_priv *priv =snd_soc_component_get_drvdata (component); +unsigned long mclk_freq; +int ret; + +switch (clk_id) { +case WM8904_CLK_AUTO : + mclk_freq =clk_get_rate (priv->mclk); +/* enable FLL if a different sysclk is desired */ +if (mclk_freq != freq) { + priv->sysclk_src =WM8904_CLK_FLL ; + ret =wm8904_set_fll (dai,WM8904_FLL_MCLK , +WM8904_FLL_MCLK , +clk_get_rate (priv->mclk), freq); +if (ret) +return ret; +break ; + } + clk_id =WM8904_CLK_MCLK ; +/* fallthrough */ + +case WM8904_CLK_MCLK : + priv->sysclk_src = clk_id; + priv->mclk_rate = freq; +break ; + +case WM8904_CLK_FLL : + priv->sysclk_src = clk_id; +break ; + +default : +return -EINVAL ; + } + +dev_dbg (dai->dev,"Clock source is %d at %uHz\n" , clk_id, freq); + +wm8904_configure_clocking (component); + +return 0 ; +} +static int wm8904_digital_mute (struct snd_soc_dai *codec_dai,int mute) {struct snd_soc_component *component = codec_dai->component;
sound/soc/codecs/wm8904.h +1 -0
@@ -10,6 +10,7 @@#ifndef _WM8904_H#define _WM8904_H +#define WM8904_CLK_AUTO 0#define WM8904_CLK_MCLK 1#define WM8904_CLK_FLL 2
Signature · 1 line
2.20.1
Quoted 16 lines · Michael Walle
This adds a new mode
WM8904_CLK_AUTOwhich automatically enables the FLL if a frequency different than the MCLK is set.These additions make the codec work with the simple-card driver in general and especially in systems where the MCLK doesn't match the requested clock.
Signed-off-by Michael Walle <[email protected]>---
sound/soc/codecs/wm8904.c +7
-0+static int wm8904_set_sysclk (struct snd_soc_dai *dai,int clk_id, +unsigned int freq,int dir) +{ +struct snd_soc_component *component = dai->component; +struct wm8904_priv *priv =snd_soc_component_get_drvdata (component); +unsigned long mclk_freq; +int ret;
sound/soc/codecs/wm8904.c static int wm8904_set_fll(struct snd_soc_dai *dai, int fll_id, int source, · line 1815
Quoted 10 lines
sound/soc/codecs/wm8904.c +10
-0+ +switch (clk_id) { +case WM8904_CLK_AUTO : + mclk_freq =clk_get_rate (priv->mclk); +/* enable FLL if a different sysclk is desired */ +if (mclk_freq != freq) { + priv->sysclk_src =WM8904_CLK_FLL ; + ret =wm8904_set_fll (dai,WM8904_FLL_MCLK , +WM8904_FLL_MCLK , +clk_get_rate (priv->mclk), freq);
minor nit, might as well use mclk_freq rather than calling clk_get_rate again, other than that though I think this looks good.
Thanks,
Charles
_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Am 2019-11-08 17:07, schrieb Charles Keepax:
Quoted 23 lines · Michael Walle
Quoted 22 lines
This adds a new mode
WM8904_CLK_AUTOwhich automatically enables the FLL if a frequency different than the MCLK is set.These additions make the codec work with the simple-card driver in general and especially in systems where the MCLK doesn't match the requested clock.
Signed-off-by Michael Walle <[email protected]>---
sound/soc/codecs/wm8904.c +13
-0+static int wm8904_set_sysclk (struct snd_soc_dai *dai,int clk_id, +unsigned int freq,int dir) +{ +struct snd_soc_component *component = dai->component; +struct wm8904_priv *priv =snd_soc_component_get_drvdata (component); +unsigned long mclk_freq; +int ret; + +switch (clk_id) { +case WM8904_CLK_AUTO : + mclk_freq =clk_get_rate (priv->mclk); +/* enable FLL if a different sysclk is desired */ +if (mclk_freq != freq) {
Quoted 8 lines
sound/soc/codecs/wm8904.c static int wm8904_set_fll(struct snd_soc_dai *dai, int fll_id, int source, · line 1815
Quoted 4 lines
sound/soc/codecs/wm8904.c +4
-0+ priv->sysclk_src =WM8904_CLK_FLL ; + ret =wm8904_set_fll (dai,WM8904_FLL_MCLK , +WM8904_FLL_MCLK , +clk_get_rate (priv->mclk), freq);minor nit, might as well use
mclk_freqrather than callingclk_get_rateagain, other than that though I think this looks good.
whoops, I was too tired then. That was the whole intention of using the mclk_freq variable.. so yes, I'll fix that.
-michael