From: Peter Ujfalusi <peter.ujfalusi@nokia.com>
To: alsa-devel@alsa-project.org
Cc: sakoman@gmail.com, Peter Ujfalusi <peter.ujfalusi@nokia.com>
Subject: [PATCH 1/9] ASoC: TWL4030: Correct DAPM_DAC with power control
Date: Tue, 9 Dec 2008 08:45:43 +0200 [thread overview]
Message-ID: <1228805151-29385-2-git-send-email-peter.ujfalusi@nokia.com> (raw)
In-Reply-To: <1228805151-29385-1-git-send-email-peter.ujfalusi@nokia.com>
Add all four DACs to dapm_widgets with power switch.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
---
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 3c9fdf2..3543bf6 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[] = {
SND_SOC_DAPM_OUTPUT("OUTL"),
SND_SOC_DAPM_OUTPUT("OUTR"),
- SND_SOC_DAPM_DAC("DACL", "Left Playback", SND_SOC_NOPM, 0, 0),
- SND_SOC_DAPM_DAC("DACR", "Right Playback", SND_SOC_NOPM, 0, 0),
+ /* DACs */
+ SND_SOC_DAPM_DAC("DACR1", "Right Front Playback",
+ TWL4030_REG_AVDAC_CTL, 0, 0),
+ SND_SOC_DAPM_DAC("DACL1", "Left Front Playback",
+ TWL4030_REG_AVDAC_CTL, 1, 0),
+ SND_SOC_DAPM_DAC("DACR2", "Right Rear Playback",
+ TWL4030_REG_AVDAC_CTL, 2, 0),
+ SND_SOC_DAPM_DAC("DACL2", "Left Rear Playback",
+ TWL4030_REG_AVDAC_CTL, 3, 0),
SND_SOC_DAPM_ADC("ADCL", "Left Capture", SND_SOC_NOPM, 0, 0),
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[] = {
static const struct snd_soc_dapm_route intercon[] = {
/* outputs */
- {"OUTL", NULL, "DACL"},
- {"OUTR", NULL, "DACR"},
+ {"OUTL", NULL, "DACL2"},
+ {"OUTR", NULL, "DACR2"},
/* inputs */
{"ADCL", NULL, "INL"},
--
1.6.0.3
next prev parent reply other threads:[~2008-12-09 6:46 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-09 6:45 [PATCH 0/9] ASoC: TWL4030: DAPM implementation for outputs (playback) - try2 Peter Ujfalusi
2008-12-09 6:45 ` Peter Ujfalusi [this message]
2008-12-09 6:45 ` [PATCH 2/9] ASoC: TWL4030: Add Analog PGA control switch to DAPM Peter Ujfalusi
2008-12-09 6:45 ` [PATCH 3/9] ASoC: TWL4030: Add DAPM event handler for output MUX selection Peter Ujfalusi
2008-12-09 6:45 ` [PATCH 4/9] ASoC: TWL4030: DAPM mapping of the Earpiece output Peter Ujfalusi
2008-12-09 6:45 ` [PATCH 5/9] ASoC: TWL4030: DAPM mapping of the PreDriv outputs Peter Ujfalusi
2008-12-09 6:45 ` [PATCH 6/9] ASoC: TWL4030: DAPM mapping of the Headset outputs Peter Ujfalusi
2008-12-09 6:45 ` [PATCH 7/9] ASoC: TWL4030: DAPM mapping of the Carkit outputs Peter Ujfalusi
2008-12-09 6:45 ` [PATCH 8/9] ASoC: TWL4030: DAPM mapping of the Handsfree outputs Peter Ujfalusi
2008-12-09 6:45 ` [PATCH 9/9] ASoC: TWL4030: Do not alter the Headset output volume on power-up/down Peter Ujfalusi
2008-12-09 10:03 ` [PATCH 4/9] ASoC: TWL4030: DAPM mapping of the Earpiece output Mark Brown
2008-12-09 10:08 ` Peter Ujfalusi
2008-12-09 10:04 ` [PATCH 2/9] ASoC: TWL4030: Add Analog PGA control switch to DAPM Mark Brown
2008-12-09 10:03 ` [PATCH 1/9] ASoC: TWL4030: Correct DAPM_DAC with power control Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2008-12-09 10:35 [PATCH 0/9] ASoC: TWL4030: DAPM implementation for outputs (playback) - try3 Peter Ujfalusi
2008-12-09 10:35 ` [PATCH 1/9] ASoC: TWL4030: Correct DAPM_DAC with power control Peter Ujfalusi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1228805151-29385-2-git-send-email-peter.ujfalusi@nokia.com \
--to=peter.ujfalusi@nokia.com \
--cc=alsa-devel@alsa-project.org \
--cc=sakoman@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox