diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-24 10:21:08 +0300 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-24 10:21:08 +0300 |
| commit | 540565257101f7c52b6fc5a57651f7505f8d20fe (patch) | |
| tree | 7adee0bc65a02fead0dd9cae4f2d4632b227ac56 /sound/soc/codecs/wm8350.c | |
| parent | 4d048435e9864998f6a6ad16422393d42322716d (diff) | |
| parent | 421b446abeec55bed1251fab80cb5c12be58b773 (diff) | |
| download | linux-540565257101f7c52b6fc5a57651f7505f8d20fe.tar.xz | |
Merge branch 'rmobile/fsi-despair' into rmobile-fixes-for-linus
Diffstat (limited to 'sound/soc/codecs/wm8350.c')
| -rw-r--r-- | sound/soc/codecs/wm8350.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index f4f1fba38eb9..7611add7f8c3 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c @@ -831,7 +831,7 @@ static int wm8350_set_dai_sysclk(struct snd_soc_dai *codec_dai, } /* MCLK direction */ - if (dir == WM8350_MCLK_DIR_OUT) + if (dir == SND_SOC_CLOCK_OUT) wm8350_set_bits(wm8350, WM8350_CLOCK_CONTROL_2, WM8350_MCLK_DIR); else @@ -1586,6 +1586,13 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec) wm8350_set_bits(wm8350, WM8350_ROUT2_VOLUME, WM8350_OUT2_VU | WM8350_OUT2R_MUTE); + /* Make sure AIF tristating is disabled by default */ + wm8350_clear_bits(wm8350, WM8350_AI_FORMATING, WM8350_AIF_TRI); + + /* Make sure we've got a sane companding setup too */ + wm8350_clear_bits(wm8350, WM8350_ADC_DAC_COMP, + WM8350_DAC_COMP | WM8350_LOOPBACK); + /* Make sure jack detect is disabled to start off with */ wm8350_clear_bits(wm8350, WM8350_JACK_DETECT, WM8350_JDL_ENA | WM8350_JDR_ENA); |