ASoC: Move WM8350 microphone detection bias managment out of driver

Allow machines to control exactly when the bias is turned on and off.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>

diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index ff6c10155ee63cf2d26151a7477ffb55fff58047..fb1005edee79ee07d544955d161d017ee18e8441 100644 (file)
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -1475,8 +1475,6 @@ int wm8350_mic_jack_detect(struct snd_soc_codec *codec,
        wm8350_set_bits(wm8350, WM8350_POWER_MGMT_4, WM8350_TOCLK_ENA);
        wm8350_set_bits(wm8350, WM8350_POWER_MGMT_1, WM8350_MIC_DET_ENA);
 
-       snd_soc_dapm_force_enable_pin(codec, "Mic Bias");
-
        return 0;
 }
 EXPORT_SYMBOL_GPL(wm8350_mic_jack_detect);

diff --git a/sound/soc/imx/wm1133-ev1.c b/sound/soc/imx/wm1133-ev1.c
index cec8bae7ac180539283215cb366c1e2553d22482..a6e7d94976399ee8c8f01fbd14268ef440e989c9 100644 (file)
--- a/sound/soc/imx/wm1133-ev1.c
+++ b/sound/soc/imx/wm1133-ev1.c
@@ -234,6 +234,8 @@ static int wm1133_ev1_init(struct snd_soc_codec *codec)
        wm8350_mic_jack_detect(codec, &mic_jack, SND_JACK_MICROPHONE,
                               SND_JACK_BTN_0);
 
+       snd_soc_dapm_force_enable_pin(codec, "Mic Bias");
+
        return 0;
 }