summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8400.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-10-22 22:48:27 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-10-24 14:09:26 +0200
commit1d533de998e2887f23c8cf6c39d5db55f8d202af (patch)
tree44f647c7c5cffcb91cbf681b349e4cebf03bb341 /sound/soc/codecs/wm8400.c
parent0d8d293898ff0ea395840cdf2ac85fbd53c8d3ea (diff)
downloadblackbird-op-linux-1d533de998e2887f23c8cf6c39d5db55f8d202af.tar.gz
blackbird-op-linux-1d533de998e2887f23c8cf6c39d5db55f8d202af.zip
ASoC: wm8400: Fix setting Fout clock divider for FLL Control 4
What we want here is to clear the WM8400_FLL_OUTDIV_MASK bits then OR with factors.outdiv. Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8400.c')
-rw-r--r--sound/soc/codecs/wm8400.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c
index dc13be2a09c5..f29bc26ba416 100644
--- a/sound/soc/codecs/wm8400.c
+++ b/sound/soc/codecs/wm8400.c
@@ -1059,7 +1059,7 @@ static int wm8400_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
wm8400_write(codec, WM8400_FLL_CONTROL_3, factors.n);
reg = wm8400_read(codec, WM8400_FLL_CONTROL_4);
- reg &= WM8400_FLL_OUTDIV_MASK;
+ reg &= ~WM8400_FLL_OUTDIV_MASK;
reg |= factors.outdiv;
wm8400_write(codec, WM8400_FLL_CONTROL_4, reg);
OpenPOWER on IntegriCloud