diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-17 18:51:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-17 18:53:44 +0100 |
| commit | 0182dcc52c759d005cc3e65deadee9f166cdd7d0 (patch) | |
| tree | 76265f416bbaef69fb1bd94b636ec2ad77d48a97 /sound/soc/codecs | |
| parent | 1ca04065c3569beb42b9376952df8c96f430f753 (diff) | |
| download | linux-stable-0182dcc52c759d005cc3e65deadee9f166cdd7d0.tar.gz linux-stable-0182dcc52c759d005cc3e65deadee9f166cdd7d0.tar.bz2 linux-stable-0182dcc52c759d005cc3e65deadee9f166cdd7d0.zip | |
ASoC: Fix WM8993 MCLK configuration for high frequency MCLKs
When used without the PLL we were accidentally clearing the MCLK/2
divider, resulting in a double rate SYSCLK when the divider should
have been used.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/wm8993.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c index cd1566931135..f9119a6e616e 100644 --- a/sound/soc/codecs/wm8993.c +++ b/sound/soc/codecs/wm8993.c @@ -519,7 +519,7 @@ static int configure_clock(struct snd_soc_codec *codec) dev_dbg(codec->dev, "Using %dHz MCLK\n", wm8993->mclk_rate); reg = wm8993_read(codec, WM8993_CLOCKING_2); - reg &= ~WM8993_SYSCLK_SRC; + reg &= ~(WM8993_MCLK_DIV | WM8993_SYSCLK_SRC); if (wm8993->mclk_rate > 13500000) { reg |= WM8993_MCLK_DIV; wm8993->sysclk_rate = wm8993->mclk_rate / 2; @@ -527,8 +527,6 @@ static int configure_clock(struct snd_soc_codec *codec) reg &= ~WM8993_MCLK_DIV; wm8993->sysclk_rate = wm8993->mclk_rate; } - reg &= ~WM8993_MCLK_DIV; - reg &= ~(WM8993_MCLK_DIV | WM8993_SYSCLK_SRC); wm8993_write(codec, WM8993_CLOCKING_2, reg); break; |