diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2011-12-22 05:47:21 -0500 |
---|---|---|
committer | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-01-26 08:40:43 -0500 |
commit | 778cee7afd063b1321dd9a2d2ecd8822d76bb33a (patch) | |
tree | de91926882b22e54dcc53ce96eba256ce3e64d51 /sound/soc/omap/omap-abe-twl6040.c | |
parent | d1be1d2fd1158b45dca99e3924621e1068c87b82 (diff) |
ASoC: twl6040: Convert MICBIAS to SUPPLY widget
In order to avoid breakage change the omap-abe-twl6040
machine driver's routing.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/omap/omap-abe-twl6040.c')
-rw-r--r-- | sound/soc/omap/omap-abe-twl6040.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c index 6b7047066f43..ca7152cb6a25 100644 --- a/sound/soc/omap/omap-abe-twl6040.c +++ b/sound/soc/omap/omap-abe-twl6040.c | |||
@@ -123,17 +123,17 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = { | |||
123 | 123 | ||
124 | static const struct snd_soc_dapm_route audio_map[] = { | 124 | static const struct snd_soc_dapm_route audio_map[] = { |
125 | /* External Mics: MAINMIC, SUBMIC with bias*/ | 125 | /* External Mics: MAINMIC, SUBMIC with bias*/ |
126 | {"MAINMIC", NULL, "Main Mic Bias"}, | 126 | {"MAINMIC", NULL, "Ext Mic"}, |
127 | {"SUBMIC", NULL, "Main Mic Bias"}, | 127 | {"SUBMIC", NULL, "Ext Mic"}, |
128 | {"Main Mic Bias", NULL, "Ext Mic"}, | 128 | {"Ext Mic", NULL, "Main Mic Bias"}, |
129 | 129 | ||
130 | /* External Speakers: HFL, HFR */ | 130 | /* External Speakers: HFL, HFR */ |
131 | {"Ext Spk", NULL, "HFL"}, | 131 | {"Ext Spk", NULL, "HFL"}, |
132 | {"Ext Spk", NULL, "HFR"}, | 132 | {"Ext Spk", NULL, "HFR"}, |
133 | 133 | ||
134 | /* Headset Mic: HSMIC with bias */ | 134 | /* Headset Mic: HSMIC with bias */ |
135 | {"HSMIC", NULL, "Headset Mic Bias"}, | 135 | {"HSMIC", NULL, "Headset Mic"}, |
136 | {"Headset Mic Bias", NULL, "Headset Mic"}, | 136 | {"Headset Mic", NULL, "Headset Mic Bias"}, |
137 | 137 | ||
138 | /* Headset Stereophone (Headphone): HSOL, HSOR */ | 138 | /* Headset Stereophone (Headphone): HSOL, HSOR */ |
139 | {"Headset Stereophone", NULL, "HSOL"}, | 139 | {"Headset Stereophone", NULL, "HSOL"}, |
@@ -182,8 +182,8 @@ static const struct snd_soc_dapm_widget dmic_dapm_widgets[] = { | |||
182 | }; | 182 | }; |
183 | 183 | ||
184 | static const struct snd_soc_dapm_route dmic_audio_map[] = { | 184 | static const struct snd_soc_dapm_route dmic_audio_map[] = { |
185 | {"DMic", NULL, "Digital Mic1 Bias"}, | 185 | {"DMic", NULL, "Digital Mic"}, |
186 | {"Digital Mic1 Bias", NULL, "Digital Mic"}, | 186 | {"Digital Mic", NULL, "Digital Mic1 Bias"}, |
187 | }; | 187 | }; |
188 | 188 | ||
189 | static int omap_abe_dmic_init(struct snd_soc_pcm_runtime *rtd) | 189 | static int omap_abe_dmic_init(struct snd_soc_pcm_runtime *rtd) |