ASoC: twl4030: Convert MICBIAS to SUPPLY widget

In order to avoid breakage update the machine drivers at the same time using
twl4030: omap3pandora, sdp3430 and zoom2

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

3 files changed, 18 insertions, 18 deletions

diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
index 43d950a79ff9..805512f2555a 100644
--- a/sound/soc/omap/omap3pandora.c
+++ b/sound/soc/omap/omap3pandora.c
@@ -144,11 +144,11 @@ static const struct snd_soc_dapm_route omap3pandora_in_map[] = {
         {"AUXL", NULL, "Line In"},
         {"AUXR", NULL, "Line In"},
 
-        {"MAINMIC", NULL, "Mic Bias 1"},
-        {"Mic Bias 1", NULL, "Mic (internal)"},
+        {"MAINMIC", NULL, "Mic (internal)"},
+        {"Mic (internal)", NULL, "Mic Bias 1"},
 
-        {"SUBMIC", NULL, "Mic Bias 2"},
-        {"Mic Bias 2", NULL, "Mic (external)"},
+        {"SUBMIC", NULL, "Mic (external)"},
+        {"Mic (external)", NULL, "Mic Bias 2"},
 };
 
 static int omap3pandora_out_init(struct snd_soc_pcm_runtime *rtd)
diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c
index 86e77e9d24c6..f2e26512d2a0 100644
--- a/sound/soc/omap/sdp3430.c
+++ b/sound/soc/omap/sdp3430.c
@@ -104,19 +104,19 @@ static const struct snd_soc_dapm_widget sdp3430_twl4030_dapm_widgets[] = {
 };
 
 static const struct snd_soc_dapm_route audio_map[] = {
-        /* External Mics: MAINMIC, SUBMIC with bias*/
-        {"MAINMIC", NULL, "Mic Bias 1"},
-        {"SUBMIC", NULL, "Mic Bias 2"},
-        {"Mic Bias 1", NULL, "Ext Mic"},
-        {"Mic Bias 2", NULL, "Ext Mic"},
+        /* External Mics: MAINMIC, SUBMIC with bias */
+        {"MAINMIC", NULL, "Ext Mic"},
+        {"SUBMIC", NULL, "Ext Mic"},
+        {"Ext Mic", NULL, "Mic Bias 1"},
+        {"Ext Mic", NULL, "Mic Bias 2"},
 
         /* External Speakers: HFL, HFR */
         {"Ext Spk", NULL, "HFL"},
         {"Ext Spk", NULL, "HFR"},
 
         /* Headset Mic: HSMIC with bias */
-        {"HSMIC", NULL, "Headset Mic Bias"},
-        {"Headset Mic Bias", NULL, "Headset Mic"},
+        {"HSMIC", NULL, "Headset Mic"},
+        {"Headset Mic", NULL, "Headset Mic Bias"},
 
         /* Headset Stereophone (Headphone): HSOL, HSOR */
         {"Headset Stereophone", NULL, "HSOL"},
diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c
index 5845d487d273..62a6b02d9b36 100644
--- a/sound/soc/omap/zoom2.c
+++ b/sound/soc/omap/zoom2.c
@@ -69,11 +69,11 @@ static const struct snd_soc_dapm_widget zoom2_twl4030_dapm_widgets[] = {
 };
 
 static const struct snd_soc_dapm_route audio_map[] = {
-        /* External Mics: MAINMIC, SUBMIC with bias*/
-        {"MAINMIC", NULL, "Mic Bias 1"},
-        {"SUBMIC", NULL, "Mic Bias 2"},
-        {"Mic Bias 1", NULL, "Ext Mic"},
-        {"Mic Bias 2", NULL, "Ext Mic"},
+        /* External Mics: MAINMIC, SUBMIC with bias */
+        {"MAINMIC", NULL, "Ext Mic"},
+        {"SUBMIC", NULL, "Ext Mic"},
+        {"Ext Mic", NULL, "Mic Bias 1"},
+        {"Ext Mic", NULL, "Mic Bias 2"},
 
         /* External Speakers: HFL, HFR */
         {"Ext Spk", NULL, "HFL"},
@@ -84,8 +84,8 @@ static const struct snd_soc_dapm_route audio_map[] = {
         {"Headset Stereophone", NULL, "HSOR"},
 
         /* Headset Mic: HSMIC with bias */
-        {"HSMIC", NULL, "Headset Mic Bias"},
-        {"Headset Mic Bias", NULL, "Headset Mic"},
+        {"HSMIC", NULL, "Headset Mic"},
+        {"Headset Mic", NULL, "Headset Mic Bias"},
 
         /* Aux In: AUXL, AUXR */
         {"Aux In", NULL, "AUXL"},