aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorJarkko Nikula <jarkko.nikula@nokia.com>2008-06-25 07:42:08 -0400
committerJaroslav Kysela <perex@perex.cz>2008-06-26 03:02:13 -0400
commit0bd72a3d49fc9fcac0202e4a2f394c7ee82af914 (patch)
tree84691d05a03b27d5719c0eb84831da4ab03b5aed /sound
parente2be2ccf9416bb4e0eb5f851967e79261f41d7e5 (diff)
ALSA: ASoC: TLV320AIC3X: Use register modifier widget for mic bias
Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com> Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/tlv320aic3x.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 528c26acdbe2..0c7452f932e7 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -456,10 +456,12 @@ static const struct snd_soc_dapm_widget aic3x_dapm_widgets[] = {
456 &aic3x_right_line2_mux_controls), 456 &aic3x_right_line2_mux_controls),
457 457
458 /* Mic Bias */ 458 /* Mic Bias */
459 SND_SOC_DAPM_MICBIAS("Mic Bias 2V", MICBIAS_CTRL, 6, 0), 459 SND_SOC_DAPM_REG(snd_soc_dapm_micbias, "Mic Bias 2V",
460 SND_SOC_DAPM_MICBIAS("Mic Bias 2.5V", MICBIAS_CTRL, 7, 0), 460 MICBIAS_CTRL, 6, 3, 1, 0),
461 SND_SOC_DAPM_MICBIAS("Mic Bias AVDD", MICBIAS_CTRL, 6, 0), 461 SND_SOC_DAPM_REG(snd_soc_dapm_micbias, "Mic Bias 2.5V",
462 SND_SOC_DAPM_MICBIAS("Mic Bias AVDD", MICBIAS_CTRL, 7, 0), 462 MICBIAS_CTRL, 6, 3, 2, 0),
463 SND_SOC_DAPM_REG(snd_soc_dapm_micbias, "Mic Bias AVDD",
464 MICBIAS_CTRL, 6, 3, 3, 0),
463 465
464 /* Left PGA to Left Output bypass */ 466 /* Left PGA to Left Output bypass */
465 SND_SOC_DAPM_MIXER("Left PGA Bypass Mixer", SND_SOC_NOPM, 0, 0, 467 SND_SOC_DAPM_MIXER("Left PGA Bypass Mixer", SND_SOC_NOPM, 0, 0,