Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...

[mv-sheeva.git] / sound / soc / codecs / twl6040.c

diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index 836eb14f7b85a0598aea3aa7f1cdb9c572cf4ebf..2d8c6b825e57b9ecd17253c5de57432260ecdaab 100644 (file)
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -1138,14 +1138,14 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = {
                        TWL6040_REG_MICRCTL, 2, 0),
 
        /* Microphone bias */
-       SND_SOC_DAPM_MICBIAS("Headset Mic Bias",
-                       TWL6040_REG_AMICBCTL, 0, 0),
-       SND_SOC_DAPM_MICBIAS("Main Mic Bias",
-                       TWL6040_REG_AMICBCTL, 4, 0),
-       SND_SOC_DAPM_MICBIAS("Digital Mic1 Bias",
-                       TWL6040_REG_DMICBCTL, 0, 0),
-       SND_SOC_DAPM_MICBIAS("Digital Mic2 Bias",
-                       TWL6040_REG_DMICBCTL, 4, 0),
+       SND_SOC_DAPM_SUPPLY("Headset Mic Bias",
+                           TWL6040_REG_AMICBCTL, 0, 0, NULL, 0),
+       SND_SOC_DAPM_SUPPLY("Main Mic Bias",
+                           TWL6040_REG_AMICBCTL, 4, 0, NULL, 0),
+       SND_SOC_DAPM_SUPPLY("Digital Mic1 Bias",
+                           TWL6040_REG_DMICBCTL, 0, 0, NULL, 0),
+       SND_SOC_DAPM_SUPPLY("Digital Mic2 Bias",
+                           TWL6040_REG_DMICBCTL, 4, 0, NULL, 0),
 
        /* DACs */
        SND_SOC_DAPM_DAC("HSDAC Left", "Headset Playback", SND_SOC_NOPM, 0, 0),