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>

diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 79b2f86f61cf367961935e5ed0dd4dfa930cda9d..5dd7c81623a6c46cbee923b8d1c69f7f63c5dd8a 100644 (file)
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -1479,9 +1479,13 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {
        SND_SOC_DAPM_SUPPLY("micbias2 select", TWL4030_REG_MICBIAS_CTL, 6, 0,
                            NULL, 0),
 
-       SND_SOC_DAPM_MICBIAS("Mic Bias 1", TWL4030_REG_MICBIAS_CTL, 0, 0),
-       SND_SOC_DAPM_MICBIAS("Mic Bias 2", TWL4030_REG_MICBIAS_CTL, 1, 0),
-       SND_SOC_DAPM_MICBIAS("Headset Mic Bias", TWL4030_REG_MICBIAS_CTL, 2, 0),
+       /* Microphone bias */
+       SND_SOC_DAPM_SUPPLY("Mic Bias 1",
+                           TWL4030_REG_MICBIAS_CTL, 0, 0, NULL, 0),
+       SND_SOC_DAPM_SUPPLY("Mic Bias 2",
+                           TWL4030_REG_MICBIAS_CTL, 1, 0, NULL, 0),
+       SND_SOC_DAPM_SUPPLY("Headset Mic Bias",
+                           TWL4030_REG_MICBIAS_CTL, 2, 0, NULL, 0),
 
        SND_SOC_DAPM_SUPPLY("VIF Enable", TWL4030_REG_VOICE_IF, 0, 0, NULL, 0),
 };

diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
index 43d950a79ff9faf0f6496bd3e0bbba7f7326502e..805512f2555a0b95571a4608f6d4e35a71312c5f 100644 (file)
--- 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 86e77e9d24c6877894e77a5e97a50d892d90fd02..f2e26512d2a06cd628acef5f561dd14667b0ed99 100644 (file)
--- 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 5845d487d27361c31813a8963bc4201575280fe2..62a6b02d9b368c6d3c79b392a949f1c3b9797035 100644 (file)
--- 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"},