Commit 0182dcc5 authored by Mark Brown's avatar Mark Brown

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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 1ca04065
...@@ -519,7 +519,7 @@ static int configure_clock(struct snd_soc_codec *codec) ...@@ -519,7 +519,7 @@ static int configure_clock(struct snd_soc_codec *codec)
dev_dbg(codec->dev, "Using %dHz MCLK\n", wm8993->mclk_rate); dev_dbg(codec->dev, "Using %dHz MCLK\n", wm8993->mclk_rate);
reg = wm8993_read(codec, WM8993_CLOCKING_2); reg = wm8993_read(codec, WM8993_CLOCKING_2);
reg &= ~WM8993_SYSCLK_SRC; reg &= ~(WM8993_MCLK_DIV | WM8993_SYSCLK_SRC);
if (wm8993->mclk_rate > 13500000) { if (wm8993->mclk_rate > 13500000) {
reg |= WM8993_MCLK_DIV; reg |= WM8993_MCLK_DIV;
wm8993->sysclk_rate = wm8993->mclk_rate / 2; wm8993->sysclk_rate = wm8993->mclk_rate / 2;
...@@ -527,8 +527,6 @@ static int configure_clock(struct snd_soc_codec *codec) ...@@ -527,8 +527,6 @@ static int configure_clock(struct snd_soc_codec *codec)
reg &= ~WM8993_MCLK_DIV; reg &= ~WM8993_MCLK_DIV;
wm8993->sysclk_rate = wm8993->mclk_rate; wm8993->sysclk_rate = wm8993->mclk_rate;
} }
reg &= ~WM8993_MCLK_DIV;
reg &= ~(WM8993_MCLK_DIV | WM8993_SYSCLK_SRC);
wm8993_write(codec, WM8993_CLOCKING_2, reg); wm8993_write(codec, WM8993_CLOCKING_2, reg);
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment