diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-10 15:41:12 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-10 15:41:12 +0000 |
| commit | 00fb0d98add90480f60db2d1701ef2bb68a73797 (patch) | |
| tree | be81fd6e8869e5550fc131958607f99d001e9096 | |
| parent | fd8d3bc09033a275d08536c698309e18ee3c14bf (diff) | |
| parent | 0049317edb76d17bfac736b658523c15935391a3 (diff) | |
| download | linux-00fb0d98add90480f60db2d1701ef2bb68a73797.tar.bz2 | |
Merge branch 'for-2.6.37' into for-2.6.38
| -rw-r--r-- | include/linux/mfd/wm8350/audio.h | 3 | ||||
| -rw-r--r-- | sound/soc/codecs/wm8350.c | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/include/linux/mfd/wm8350/audio.h b/include/linux/mfd/wm8350/audio.h index a95141eafce3..bd581c6fa085 100644 --- a/include/linux/mfd/wm8350/audio.h +++ b/include/linux/mfd/wm8350/audio.h @@ -522,9 +522,6 @@ #define WM8350_MCLK_SEL_PLL_32K 3 #define WM8350_MCLK_SEL_MCLK 5 -#define WM8350_MCLK_DIR_OUT 0 -#define WM8350_MCLK_DIR_IN 1 - /* clock divider id's */ #define WM8350_ADC_CLKDIV 0 #define WM8350_DAC_CLKDIV 1 diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index 4c6c81e11544..d5e6e02ff350 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c @@ -833,7 +833,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 @@ -1588,6 +1588,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); |