diff options
author | Peter Ujfalusi <peter.ujfalusi@nokia.com> | 2008-12-09 01:45:43 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-12-09 05:05:02 -0500 |
commit | 53b5047d994edfcafabc0e95bb681ae70d6e8604 (patch) | |
tree | 58674aa459aa8e3c1c5f0e0363aca18508fdba69 /sound/soc/codecs | |
parent | 28a1d869560a49d960ba2a3b450ec965712e5560 (diff) |
ASoC: TWL4030: Correct DAPM_DAC with power control
Add all four DACs to dapm_widgets with power switch.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r-- | sound/soc/codecs/twl4030.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 3c9fdf2c6c7b..3543bf6e258f 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c | |||
@@ -616,8 +616,15 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { | |||
616 | SND_SOC_DAPM_OUTPUT("OUTL"), | 616 | SND_SOC_DAPM_OUTPUT("OUTL"), |
617 | SND_SOC_DAPM_OUTPUT("OUTR"), | 617 | SND_SOC_DAPM_OUTPUT("OUTR"), |
618 | 618 | ||
619 | SND_SOC_DAPM_DAC("DACL", "Left Playback", SND_SOC_NOPM, 0, 0), | 619 | /* DACs */ |
620 | SND_SOC_DAPM_DAC("DACR", "Right Playback", SND_SOC_NOPM, 0, 0), | 620 | SND_SOC_DAPM_DAC("DACR1", "Right Front Playback", |
621 | TWL4030_REG_AVDAC_CTL, 0, 0), | ||
622 | SND_SOC_DAPM_DAC("DACL1", "Left Front Playback", | ||
623 | TWL4030_REG_AVDAC_CTL, 1, 0), | ||
624 | SND_SOC_DAPM_DAC("DACR2", "Right Rear Playback", | ||
625 | TWL4030_REG_AVDAC_CTL, 2, 0), | ||
626 | SND_SOC_DAPM_DAC("DACL2", "Left Rear Playback", | ||
627 | TWL4030_REG_AVDAC_CTL, 3, 0), | ||
621 | 628 | ||
622 | SND_SOC_DAPM_ADC("ADCL", "Left Capture", SND_SOC_NOPM, 0, 0), | 629 | SND_SOC_DAPM_ADC("ADCL", "Left Capture", SND_SOC_NOPM, 0, 0), |
623 | SND_SOC_DAPM_ADC("ADCR", "Right Capture", SND_SOC_NOPM, 0, 0), | 630 | SND_SOC_DAPM_ADC("ADCR", "Right Capture", SND_SOC_NOPM, 0, 0), |
@@ -625,8 +632,8 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { | |||
625 | 632 | ||
626 | static const struct snd_soc_dapm_route intercon[] = { | 633 | static const struct snd_soc_dapm_route intercon[] = { |
627 | /* outputs */ | 634 | /* outputs */ |
628 | {"OUTL", NULL, "DACL"}, | 635 | {"OUTL", NULL, "DACL2"}, |
629 | {"OUTR", NULL, "DACR"}, | 636 | {"OUTR", NULL, "DACR2"}, |
630 | 637 | ||
631 | /* inputs */ | 638 | /* inputs */ |
632 | {"ADCL", NULL, "INL"}, | 639 | {"ADCL", NULL, "INL"}, |