aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/tegra
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-27 07:20:08 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-28 12:02:07 -0500
commit5032dc34294d1084b7367877dadb6edb2d45ad7c (patch)
tree24bcc979bf322cb4ab8ce85621b920b0facff83d /sound/soc/tegra
parent5bbcc3c0d0f063318ec83146d1958acf7154c66f (diff)
ASoC: Convert WM8903 MICBIAS to a supply widget
Also rename it to MICBIAS to reflect the pin name and help any out of tree users notice the change. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'sound/soc/tegra')
-rw-r--r--sound/soc/tegra/tegra_wm8903.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index b260f54a446..2f5b1074a8d 100644
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -201,8 +201,8 @@ static const struct snd_soc_dapm_route harmony_audio_map[] = {
201 {"Int Spk", NULL, "RON"}, 201 {"Int Spk", NULL, "RON"},
202 {"Int Spk", NULL, "LOP"}, 202 {"Int Spk", NULL, "LOP"},
203 {"Int Spk", NULL, "LON"}, 203 {"Int Spk", NULL, "LON"},
204 {"Mic Bias", NULL, "Mic Jack"}, 204 {"Mic Jack", NULL, "MICBIAS"},
205 {"IN1L", NULL, "Mic Bias"}, 205 {"IN1L", NULL, "Mic Jack"},
206}; 206};
207 207
208static const struct snd_soc_dapm_route seaboard_audio_map[] = { 208static const struct snd_soc_dapm_route seaboard_audio_map[] = {
@@ -212,8 +212,8 @@ static const struct snd_soc_dapm_route seaboard_audio_map[] = {
212 {"Int Spk", NULL, "RON"}, 212 {"Int Spk", NULL, "RON"},
213 {"Int Spk", NULL, "LOP"}, 213 {"Int Spk", NULL, "LOP"},
214 {"Int Spk", NULL, "LON"}, 214 {"Int Spk", NULL, "LON"},
215 {"Mic Bias", NULL, "Mic Jack"}, 215 {"Mic Jack", NULL, "MICBIAS"},
216 {"IN1R", NULL, "Mic Bias"}, 216 {"IN1R", NULL, "Mic Jack"},
217}; 217};
218 218
219static const struct snd_soc_dapm_route kaen_audio_map[] = { 219static const struct snd_soc_dapm_route kaen_audio_map[] = {
@@ -223,8 +223,8 @@ static const struct snd_soc_dapm_route kaen_audio_map[] = {
223 {"Int Spk", NULL, "RON"}, 223 {"Int Spk", NULL, "RON"},
224 {"Int Spk", NULL, "LOP"}, 224 {"Int Spk", NULL, "LOP"},
225 {"Int Spk", NULL, "LON"}, 225 {"Int Spk", NULL, "LON"},
226 {"Mic Bias", NULL, "Mic Jack"}, 226 {"Mic Jack", NULL, "MICBIAS"},
227 {"IN2R", NULL, "Mic Bias"}, 227 {"IN2R", NULL, "Mic Jack"},
228}; 228};
229 229
230static const struct snd_soc_dapm_route aebl_audio_map[] = { 230static const struct snd_soc_dapm_route aebl_audio_map[] = {
@@ -232,8 +232,8 @@ static const struct snd_soc_dapm_route aebl_audio_map[] = {
232 {"Headphone Jack", NULL, "HPOUTL"}, 232 {"Headphone Jack", NULL, "HPOUTL"},
233 {"Int Spk", NULL, "LINEOUTR"}, 233 {"Int Spk", NULL, "LINEOUTR"},
234 {"Int Spk", NULL, "LINEOUTL"}, 234 {"Int Spk", NULL, "LINEOUTL"},
235 {"Mic Bias", NULL, "Mic Jack"}, 235 {"Mic Jack", NULL, "MICBIAS"},
236 {"IN1R", NULL, "Mic Bias"}, 236 {"IN1R", NULL, "Mic Jack"},
237}; 237};
238 238
239static const struct snd_kcontrol_new tegra_wm8903_controls[] = { 239static const struct snd_kcontrol_new tegra_wm8903_controls[] = {
@@ -329,7 +329,7 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd)
329 wm8903_mic_detect(codec, &tegra_wm8903_mic_jack, SND_JACK_MICROPHONE, 329 wm8903_mic_detect(codec, &tegra_wm8903_mic_jack, SND_JACK_MICROPHONE,
330 0); 330 0);
331 331
332 snd_soc_dapm_force_enable_pin(dapm, "Mic Bias"); 332 snd_soc_dapm_force_enable_pin(dapm, "MICBIAS");
333 333
334 return 0; 334 return 0;
335} 335}