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 8/9] ASoC: TWL4030: DAPM mapping of the Handsfree outputs
Date: Tue, 9 Dec 2008 12:35:51 +0200 [thread overview]
Message-ID: <1228818952-31082-9-git-send-email-peter.ujfalusi@nokia.com> (raw)
In-Reply-To: <1228818952-31082-8-git-send-email-peter.ujfalusi@nokia.com>
Adds DAPM muxing, routing for the Handsfree outputs.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
---
sound/soc/codecs/twl4030.c | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 08c33e9..d0612a4 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -277,6 +277,30 @@ static const struct soc_enum twl4030_carkitr_enum =
static const struct snd_kcontrol_new twl4030_dapm_carkitr_control =
SOC_DAPM_ENUM("Route", twl4030_carkitr_enum);
+/* Handsfree Left */
+static const char *twl4030_handsfreel_texts[] =
+ {"Voice", "DACL1", "DACL2", "DACR2"};
+
+static const struct soc_enum twl4030_handsfreel_enum =
+ SOC_ENUM_SINGLE(TWL4030_REG_HFL_CTL, 0,
+ ARRAY_SIZE(twl4030_handsfreel_texts),
+ twl4030_handsfreel_texts);
+
+static const struct snd_kcontrol_new twl4030_dapm_handsfreel_control =
+SOC_DAPM_ENUM("Route", twl4030_handsfreel_enum);
+
+/* Handsfree Right */
+static const char *twl4030_handsfreer_texts[] =
+ {"Voice", "DACR1", "DACR2", "DACL2"};
+
+static const struct soc_enum twl4030_handsfreer_enum =
+ SOC_ENUM_SINGLE(TWL4030_REG_HFR_CTL, 0,
+ ARRAY_SIZE(twl4030_handsfreer_texts),
+ twl4030_handsfreer_texts);
+
+static const struct snd_kcontrol_new twl4030_dapm_handsfreer_control =
+SOC_DAPM_ENUM("Route", twl4030_handsfreer_enum);
+
static int outmixer_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event)
{
@@ -737,6 +761,8 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {
SND_SOC_DAPM_OUTPUT("PREDRIVER"),
SND_SOC_DAPM_OUTPUT("HSOL"),
SND_SOC_DAPM_OUTPUT("HSOR"),
+ SND_SOC_DAPM_OUTPUT("HFL"),
+ SND_SOC_DAPM_OUTPUT("HFR"),
/* DACs */
SND_SOC_DAPM_DAC("DACR1", "Right Front Playback",
@@ -780,6 +806,11 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {
&twl4030_dapm_carkitl_control),
SND_SOC_DAPM_MUX("CarkitR Mux", SND_SOC_NOPM, 0, 0,
&twl4030_dapm_carkitr_control),
+ /* HandsfreeL/R */
+ SND_SOC_DAPM_MUX("HandsfreeL Mux", TWL4030_REG_HFL_CTL, 5, 0,
+ &twl4030_dapm_handsfreel_control),
+ SND_SOC_DAPM_MUX("HandsfreeR Mux", TWL4030_REG_HFR_CTL, 5, 0,
+ &twl4030_dapm_handsfreer_control),
SND_SOC_DAPM_ADC("ADCL", "Left Capture", SND_SOC_NOPM, 0, 0),
SND_SOC_DAPM_ADC("ADCR", "Right Capture", SND_SOC_NOPM, 0, 0),
@@ -816,6 +847,14 @@ static const struct snd_soc_dapm_route intercon[] = {
/* CarkitR */
{"CarkitR Mux", "DACR1", "ARXR1_APGA"},
{"CarkitR Mux", "DACR2", "ARXR2_APGA"},
+ /* HandsfreeL */
+ {"HandsfreeL Mux", "DACL1", "ARXL1_APGA"},
+ {"HandsfreeL Mux", "DACL2", "ARXL2_APGA"},
+ {"HandsfreeL Mux", "DACR2", "ARXR2_APGA"},
+ /* HandsfreeR */
+ {"HandsfreeR Mux", "DACR1", "ARXR1_APGA"},
+ {"HandsfreeR Mux", "DACR2", "ARXR2_APGA"},
+ {"HandsfreeR Mux", "DACL2", "ARXL2_APGA"},
/* outputs */
{"OUTL", NULL, "ARXL2_APGA"},
@@ -827,6 +866,8 @@ static const struct snd_soc_dapm_route intercon[] = {
{"HSOR", NULL, "HeadsetR Mux"},
{"CARKITL", NULL, "CarkitL Mux"},
{"CARKITR", NULL, "CarkitR Mux"},
+ {"HFL", NULL, "HandsfreeL Mux"},
+ {"HFR", NULL, "HandsfreeR Mux"},
/* inputs */
{"ADCL", NULL, "INL"},
--
1.6.0.3
next prev parent reply other threads:[~2008-12-09 10:36 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
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
2008-12-09 10:35 ` [PATCH 2/9] ASoC: TWL4030: Add Analog PGA control switch to DAPM Peter Ujfalusi
2008-12-09 10:35 ` [PATCH 3/9] ASoC: TWL4030: Add DAPM event handler for output MUX selection Peter Ujfalusi
2008-12-09 10:35 ` [PATCH 4/9] ASoC: TWL4030: DAPM mapping of the Earpiece output Peter Ujfalusi
2008-12-09 10:35 ` [PATCH 5/9] ASoC: TWL4030: DAPM mapping of the PreDriv outputs Peter Ujfalusi
2008-12-09 10:35 ` [PATCH 6/9] ASoC: TWL4030: DAPM mapping of the Headset outputs Peter Ujfalusi
2008-12-09 10:35 ` [PATCH 7/9] ASoC: TWL4030: DAPM mapping of the Carkit outputs Peter Ujfalusi
2008-12-09 10:35 ` Peter Ujfalusi [this message]
2008-12-09 10:35 ` [PATCH 9/9] ASoC: TWL4030: Do not alter the Headset output volume on power-up/down Peter Ujfalusi
2008-12-09 11:06 ` [PATCH 0/9] ASoC: TWL4030: DAPM implementation for outputs (playback) - try3 Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2008-12-09 6:45 [PATCH 0/9] ASoC: TWL4030: DAPM implementation for outputs (playback) - try2 Peter Ujfalusi
2008-12-09 6:45 ` [PATCH 1/9] ASoC: TWL4030: Correct DAPM_DAC with power control Peter Ujfalusi
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
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=1228818952-31082-9-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