]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
ASoC: Ensure sane WM835x AIF configuration by default
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 9 Nov 2010 14:38:58 +0000 (14:38 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 10 Nov 2010 15:40:21 +0000 (15:40 +0000)
Ensure that whatever ran before us leaves the WM835x with a sane default
audio interface configuration as we do not override the companding,
loopback or tristate settings and do not reset the chip at startup (as it
is a PMIC).

Reported-by: Keiji Mitsuhisa <Keiji.Mitsuhisa@wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
sound/soc/codecs/wm8350.c

index 4f3e919a0755ce58e6c331aa9f7a7f29d6b8de5a..7611add7f8c38751806684a521d891ede746197f 100644 (file)
@@ -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);