Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
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 2/8] ASoC: TWL4030: Add Analog PGA control switch to DAPM
Date: Mon,  8 Dec 2008 10:09:02 +0200	[thread overview]
Message-ID: <1228723748-22911-3-git-send-email-peter.ujfalusi@nokia.com> (raw)
In-Reply-To: <1228723748-22911-2-git-send-email-peter.ujfalusi@nokia.com>

Add all four APGA switch to DAPM routing and widgets.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
---
 sound/soc/codecs/twl4030.c |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 3543bf6..11a6610 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -626,14 +626,32 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {
 	SND_SOC_DAPM_DAC("DACL2", "Left Rear Playback",
 			TWL4030_REG_AVDAC_CTL, 3, 0),
 
+	/* Analog PGAs
+	 * bit 0: APGA enable
+	 * bit 1: Digital to analog path enable
+	 */
+	SND_SOC_DAPM_REG(snd_soc_dapm_pga, "ARXR1_APGA",
+			TWL4030_REG_ARXR1_APGA_CTL, 0, 0x3, 0x3, 0x0),
+	SND_SOC_DAPM_REG(snd_soc_dapm_pga, "ARXL1_APGA",
+			TWL4030_REG_ARXL1_APGA_CTL, 0, 0x3, 0x3, 0x0),
+	SND_SOC_DAPM_REG(snd_soc_dapm_pga, "ARXR2_APGA",
+			TWL4030_REG_ARXR2_APGA_CTL, 0, 0x3, 0x3, 0x0),
+	SND_SOC_DAPM_REG(snd_soc_dapm_pga, "ARXL2_APGA",
+			TWL4030_REG_ARXL2_APGA_CTL, 0, 0x3, 0x3, 0x0),
+
 	SND_SOC_DAPM_ADC("ADCL", "Left Capture", SND_SOC_NOPM, 0, 0),
 	SND_SOC_DAPM_ADC("ADCR", "Right Capture", SND_SOC_NOPM, 0, 0),
 };
 
 static const struct snd_soc_dapm_route intercon[] = {
+	{"ARXL1_APGA", NULL, "DACL1"},
+	{"ARXR1_APGA", NULL, "DACR1"},
+	{"ARXL2_APGA", NULL, "DACL2"},
+	{"ARXR2_APGA", NULL, "DACR2"},
+
 	/* outputs */
-	{"OUTL", NULL, "DACL2"},
-	{"OUTR", NULL, "DACR2"},
+	{"OUTL", NULL, "ARXL2_APGA"},
+	{"OUTR", NULL, "ARXR2_APGA"},
 
 	/* inputs */
 	{"ADCL", NULL, "INL"},
-- 
1.6.0.3

  reply	other threads:[~2008-12-08  8:09 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-12-08  8:09 [PATCH 0/8] ASoC: TWL4030: DAPM implementation for outputs (playback) Peter Ujfalusi
2008-12-08  8:09 ` [PATCH 1/8] ASoC: TWL4030: Correct DAPM_DAC with power control Peter Ujfalusi
2008-12-08  8:09   ` Peter Ujfalusi [this message]
2008-12-08  8:09     ` [PATCH 3/8] ASoC: TWL4030: Add DAPM event handler for output MUX selection Peter Ujfalusi
2008-12-08  8:09       ` [PATCH 4/8] ASoC: TWL4030: DAPM mapping of the Earpiece output Peter Ujfalusi
2008-12-08  8:09         ` [PATCH 5/8] ASoC: TWL4030: DAPM mapping of the PreDriv outputs Peter Ujfalusi
2008-12-08  8:09           ` [PATCH 6/8] ASoC: TWL4030: DAPM mapping of the Headset outputs Peter Ujfalusi
2008-12-08  8:09             ` [PATCH 7/8] ASoC: TWL4030: DAPM mapping of the Carkit outputs Peter Ujfalusi
2008-12-08  8:09               ` [PATCH 8/8] ASoC: TWL4030: DAPM mapping of the Handsfree outputs Peter Ujfalusi
2008-12-08 11:28           ` [PATCH 5/8] ASoC: TWL4030: DAPM mapping of the PreDriv outputs Mark Brown
2008-12-08 11:40             ` Peter Ujfalusi
2008-12-08 13:50               ` Mark Brown
2008-12-08 11:24         ` [PATCH 4/8] ASoC: TWL4030: DAPM mapping of the Earpiece output Mark Brown
2008-12-08 11:23     ` [PATCH 2/8] ASoC: TWL4030: Add Analog PGA control switch to DAPM Mark Brown
2008-12-08 12:06       ` Peter Ujfalusi
2008-12-08 12:35         ` Mark Brown
2008-12-08 11:31 ` [PATCH 0/8] ASoC: TWL4030: DAPM implementation for outputs (playback) Mark Brown
2008-12-08 13:20 ` Mark Brown
2008-12-09  6:51   ` Peter Ujfalusi
2008-12-09  9:47     ` Mark Brown
2008-12-09 10:07       ` 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=1228723748-22911-3-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