summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorAlan Tull <r80115@freescale.com>2009-11-04 20:25:42 -0600
committerAlan Tull <r80115@freescale.com>2010-08-25 11:52:31 -0500
commitc01fcfed4d2c0e852161fba3c968fcfedea0d734 (patch)
treef847fca88fdf297d5436402024f0b2c552110064 /sound
parentd76cc9e5bfa26e6f1da057610e6b864466f0840b (diff)
ENGR00118016-2 wm8350: update to 2.6.31
In WM8350_FLL_CONTROL_1, keep FLL_RATE at default. Don't mute outputs by default. Signed-off-by: Alan Tull <r80115@freescale.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8350.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index 0221ca79b3ae..b9ee3cfee17f 100644
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -1136,7 +1136,7 @@ static int wm8350_set_fll(struct snd_soc_dai *codec_dai,
fll_1 = wm8350_codec_read(codec, WM8350_FLL_CONTROL_1) &
~(WM8350_FLL_OUTDIV_MASK | WM8350_FLL_RSP_RATE_MASK | 0xc000);
wm8350_codec_write(codec, WM8350_FLL_CONTROL_1,
- fll_1 | (fll_div.div << 8) | 0x50);
+ fll_1 | (fll_div.div << 8));
wm8350_codec_write(codec, WM8350_FLL_CONTROL_2,
(fll_div.ratio << 11) | (fll_div.
n & WM8350_FLL_N_MASK));
@@ -1534,13 +1534,13 @@ static int wm8350_probe(struct platform_device *pdev)
/* Latch VU bits & mute */
wm8350_set_bits(wm8350, WM8350_LOUT1_VOLUME,
- WM8350_OUT1_VU | WM8350_OUT1L_MUTE);
+ WM8350_OUT1_VU);
wm8350_set_bits(wm8350, WM8350_LOUT2_VOLUME,
- WM8350_OUT2_VU | WM8350_OUT2L_MUTE);
+ WM8350_OUT2_VU);
wm8350_set_bits(wm8350, WM8350_ROUT1_VOLUME,
- WM8350_OUT1_VU | WM8350_OUT1R_MUTE);
+ WM8350_OUT1_VU);
wm8350_set_bits(wm8350, WM8350_ROUT2_VOLUME,
- WM8350_OUT2_VU | WM8350_OUT2R_MUTE);
+ WM8350_OUT2_VU);
/* Make sure jack detect is disabled to start off with */
wm8350_clear_bits(wm8350, WM8350_JACK_DETECT,