diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2019-12-02 11:01:51 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-02-12 11:06:10 +0100 |
| commit | e66d2464a2de65fb0de2df954ab07e56b94d341d (patch) | |
| tree | f538ab71350c6e0a2b0ac151c05f36332bc87b72 /sound | |
| parent | bb519ae722395eef45101c7790c2662be59594aa (diff) | |
ASoC: wm8904: assume mclk as the clk_id for simple-audio-card
The simple-audio-card driver sets clk_id to a constant 0.
Assume that we want to derive the sysclk from the MCLK in that case rather
than error out with -EINVAL.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8904.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index 4fd350e8420d..2782b8064542 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c @@ -1408,6 +1408,13 @@ static int wm8904_set_sysclk(struct snd_soc_dai *dai, int clk_id, struct snd_soc_codec *codec = dai->codec; struct wm8904_priv *priv = snd_soc_codec_get_drvdata(codec); + /* + * If using sound-simple-card this is called with clk_id fixed to 0. + * Assume we want WM8904_CLK_MCLK for now in that case. + */ + if (clk_id == 0) + clk_id = WM8904_CLK_MCLK; + switch (clk_id) { case WM8904_CLK_MCLK: priv->sysclk_src = clk_id; |