diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-17 13:51:44 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-17 13:53:44 -0400 |
commit | 0182dcc52c759d005cc3e65deadee9f166cdd7d0 (patch) | |
tree | 76265f416bbaef69fb1bd94b636ec2ad77d48a97 /sound/soc/codecs | |
parent | 1ca04065c3569beb42b9376952df8c96f430f753 (diff) |
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) | |||
519 | dev_dbg(codec->dev, "Using %dHz MCLK\n", wm8993->mclk_rate); | 519 | dev_dbg(codec->dev, "Using %dHz MCLK\n", wm8993->mclk_rate); |
520 | 520 | ||
521 | reg = wm8993_read(codec, WM8993_CLOCKING_2); | 521 | reg = wm8993_read(codec, WM8993_CLOCKING_2); |
522 | reg &= ~WM8993_SYSCLK_SRC; | 522 | reg &= ~(WM8993_MCLK_DIV | WM8993_SYSCLK_SRC); |
523 | if (wm8993->mclk_rate > 13500000) { | 523 | if (wm8993->mclk_rate > 13500000) { |
524 | reg |= WM8993_MCLK_DIV; | 524 | reg |= WM8993_MCLK_DIV; |
525 | wm8993->sysclk_rate = wm8993->mclk_rate / 2; | 525 | wm8993->sysclk_rate = wm8993->mclk_rate / 2; |
@@ -527,8 +527,6 @@ static int configure_clock(struct snd_soc_codec *codec) | |||
527 | reg &= ~WM8993_MCLK_DIV; | 527 | reg &= ~WM8993_MCLK_DIV; |
528 | wm8993->sysclk_rate = wm8993->mclk_rate; | 528 | wm8993->sysclk_rate = wm8993->mclk_rate; |
529 | } | 529 | } |
530 | reg &= ~WM8993_MCLK_DIV; | ||
531 | reg &= ~(WM8993_MCLK_DIV | WM8993_SYSCLK_SRC); | ||
532 | wm8993_write(codec, WM8993_CLOCKING_2, reg); | 530 | wm8993_write(codec, WM8993_CLOCKING_2, reg); |
533 | break; | 531 | break; |
534 | 532 | ||