diff options
| author | Michael Walle <michael@walle.cc> | 2019-11-23 00:25:32 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-11-27 13:51:16 +0100 |
| commit | 2a0bda276c64212e517cc1d65cf65719a9ab1ef6 (patch) | |
| tree | 12ad6b8cea6acf2ac22c2ddf2ac8974112ca8de4 /sound/soc/codecs/wm8904.c | |
| parent | ASoC: rt5677: Fix build error without CONFIG_SPI (diff) | |
| download | linux-2a0bda276c64212e517cc1d65cf65719a9ab1ef6.tar.xz linux-2a0bda276c64212e517cc1d65cf65719a9ab1ef6.zip | |
ASoC: wm8904: fix automatic sysclk configuration
The simple-card tries to signal the codec to disable rate constraints,
see commit 2458adb8f92a ("SoC: simple-card-utils: set 0Hz to sysclk when
shutdown"). This wasn't handled by the codec, instead it would set the
FLL frequency to 0Hz which isn't working. Since we don't have any rate
constraints just ignore this request.
Fixes: 13409d27cb39 ("ASoC: wm8904: configure sysclk/FLL automatically")
Signed-off-by: Michael Walle <michael@walle.cc>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20191122232532.22258-1-michael@walle.cc
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/wm8904.c')
| -rw-r--r-- | sound/soc/codecs/wm8904.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index 2a7d23a5daa8..d191d81850ee 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c @@ -1806,6 +1806,12 @@ static int wm8904_set_sysclk(struct snd_soc_dai *dai, int clk_id, switch (clk_id) { case WM8904_CLK_AUTO: + /* We don't have any rate constraints, so just ignore the + * request to disable constraining. + */ + if (!freq) + return 0; + mclk_freq = clk_get_rate(priv->mclk); /* enable FLL if a different sysclk is desired */ if (mclk_freq != freq) { |