summaryrefslogtreecommitdiff
path: root/sound/soc/omap/omap3pandora.c
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-12-31 11:51:45 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-02 13:04:25 +0000
commite04d6e55fe02351b1ac338d9e8082fcc434610ce (patch)
treeb1cc6af9770215daf11d3602b1f75c1f37d491ef /sound/soc/omap/omap3pandora.c
parent57296cc28cf8aab2e5e63d8f9964718ae29cc229 (diff)
downloadlinux-3.10-e04d6e55fe02351b1ac338d9e8082fcc434610ce.tar.gz
linux-3.10-e04d6e55fe02351b1ac338d9e8082fcc434610ce.tar.bz2
linux-3.10-e04d6e55fe02351b1ac338d9e8082fcc434610ce.zip
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/omap3pandora.c')
-rw-r--r--sound/soc/omap/omap3pandora.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
index 43d950a79ff..805512f2555 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)