ASoC: wm8961 - clear WM8961_MCLKDIV bit for freq <= 16500000

AxelLin · broonie · commit 2f7dceeda470 · 2010-11-24T11:22:44.000Z
MCLKDIV bit of Register 04h Clocking1:
	0 : Divide by 1
	1 : Divide by 2

Thus in the case of freq &lt;= 16500000, we should clear MCLKDIV bit.

Signed-off-by: Axel Lin &lt;axel.lin@gmail.com&gt;
Acked-by: Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;
Signed-off-by: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;
Cc: stable@kernel.org
diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c
@@ -736,7 +736,7 @@ static int wm8961_set_sysclk(struct snd_soc_dai *dai, int clk_id,
 		freq /= 2;
 	} else {
 		dev_dbg(codec->dev, "Using MCLK/1 for %dHz MCLK\n", freq);
-		reg &= WM8961_MCLKDIV;
+		reg &= ~WM8961_MCLKDIV;
 	}
 
 	snd_soc_write(codec, WM8961_CLOCKING1, reg);

Original file line number	Diff line number	Diff line change
`@@ -736,7 +736,7 @@ static int wm8961_set_sysclk(struct snd_soc_dai *dai, int clk_id,`
`736`	`736`	`freq /= 2;`
`737`	`737`	`} else {`
`738`	`738`	`dev_dbg(codec->dev, "Using MCLK/1 for %dHz MCLK\n", freq);`
`739`		`- reg &= WM8961_MCLKDIV;`
	`739`	`+ reg &= ~WM8961_MCLKDIV;`
`740`	`740`	`}`
`741`	`741`
`742`	`742`	`snd_soc_write(codec, WM8961_CLOCKING1, reg);`