diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 09:48:36 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 13:21:38 -0400 |
commit | 2f14430af52fff08ed1987a3cee612e133a6b82f (patch) | |
tree | 3d92ac909c743ac7cef98c36287ff094b0e1b900 | |
parent | 5b9e87ccccf77f46c006c2cf0988a66d0f3f310d (diff) |
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>
-rw-r--r-- | sound/soc/codecs/wm8350.c | 2 | ||||
-rw-r--r-- | sound/soc/imx/wm1133-ev1.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index ff6c10155ee6..fb1005edee79 100644 --- 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, | |||
1475 | wm8350_set_bits(wm8350, WM8350_POWER_MGMT_4, WM8350_TOCLK_ENA); | 1475 | wm8350_set_bits(wm8350, WM8350_POWER_MGMT_4, WM8350_TOCLK_ENA); |
1476 | wm8350_set_bits(wm8350, WM8350_POWER_MGMT_1, WM8350_MIC_DET_ENA); | 1476 | wm8350_set_bits(wm8350, WM8350_POWER_MGMT_1, WM8350_MIC_DET_ENA); |
1477 | 1477 | ||
1478 | snd_soc_dapm_force_enable_pin(codec, "Mic Bias"); | ||
1479 | |||
1480 | return 0; | 1478 | return 0; |
1481 | } | 1479 | } |
1482 | EXPORT_SYMBOL_GPL(wm8350_mic_jack_detect); | 1480 | EXPORT_SYMBOL_GPL(wm8350_mic_jack_detect); |
diff --git a/sound/soc/imx/wm1133-ev1.c b/sound/soc/imx/wm1133-ev1.c index cec8bae7ac18..a6e7d9497639 100644 --- 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) | |||
234 | wm8350_mic_jack_detect(codec, &mic_jack, SND_JACK_MICROPHONE, | 234 | wm8350_mic_jack_detect(codec, &mic_jack, SND_JACK_MICROPHONE, |
235 | SND_JACK_BTN_0); | 235 | SND_JACK_BTN_0); |
236 | 236 | ||
237 | snd_soc_dapm_force_enable_pin(codec, "Mic Bias"); | ||
238 | |||
237 | return 0; | 239 | return 0; |
238 | } | 240 | } |
239 | 241 | ||