summaryrefslogtreecommitdiff
path: root/sound/soc/omap/zoom2.c
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-12-31 14:51:45 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-02 17:04:25 +0400
commite04d6e55fe02351b1ac338d9e8082fcc434610ce (patch)
treeb1cc6af9770215daf11d3602b1f75c1f37d491ef /sound/soc/omap/zoom2.c
parent57296cc28cf8aab2e5e63d8f9964718ae29cc229 (diff)
downloadlinux-e04d6e55fe02351b1ac338d9e8082fcc434610ce.tar.xz
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>
Diffstat (limited to 'sound/soc/omap/zoom2.c')
-rw-r--r--sound/soc/omap/zoom2.c14
1 files changed, 7 insertions, 7 deletions
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"},