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 8/9] ASoC: TWL4030: Add Hands-free outupt mux control
Date: Mon, 24 Nov 2008 13:49:42 +0200	[thread overview]
Message-ID: <1227527383-22516-9-git-send-email-peter.ujfalusi@nokia.com> (raw)
In-Reply-To: <1227527383-22516-8-git-send-email-peter.ujfalusi@nokia.com>

This patch adds the routing selection for the Hands-free output.

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

diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 03b0431..88f5cbe 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -198,6 +198,10 @@ static const char *twl4030_hsoutl_mix[] = {"Off", "Voice", "DACL1", "DACL2"};
 static const char *twl4030_hsoutr_mix[] = {"Off", "Voice", "DACR1", "DACR2"};
 static const char *twl4030_carkitl_mix[] = {"Off", "Voice", "DACL1", "DACL2"};
 static const char *twl4030_carkitr_mix[] = {"Off", "Voice", "DACR1", "DACR2"};
+static const char *twl4030_handsfreel_mix[] = {"Voice", "DACL1",
+					       "DACL2", "DACR2"};
+static const char *twl4030_handsfreer_mix[] = {"Voice", "DACR1",
+					       "DACR2", "DACL2"};
 
 
 static const struct soc_enum twl4030_enum[] = {
@@ -207,6 +211,8 @@ static const struct soc_enum twl4030_enum[] = {
 	SOC_ENUM_SINGLE(TWL4030_REG_HS_SEL, 3, 4, twl4030_hsoutr_mix),
 	SOC_ENUM_SINGLE(TWL4030_REG_PRECKL_CTL, 0, 4, twl4030_carkitl_mix),
 	SOC_ENUM_SINGLE(TWL4030_REG_PRECKR_CTL, 0, 4, twl4030_carkitr_mix),
+	SOC_ENUM_SINGLE(TWL4030_REG_HFL_CTL, 0, 4, twl4030_handsfreel_mix),
+	SOC_ENUM_SINGLE(TWL4030_REG_HFR_CTL, 0, 4, twl4030_handsfreer_mix),
 };
 /*
  * Some of TWL's input selection are in bitfield.
@@ -471,6 +477,10 @@ static const struct snd_kcontrol_new twl4030_snd_controls[] = {
 	SOC_DOUBLE_R_TLV_TWL4030("Carkit Playback Volume",
 		 TWL4030_REG_PRECKL_CTL, TWL4030_REG_PRECKR_CTL,
 		4, 3, 0, gainv1_tvl),
+
+	/* Hand-free output controls*/
+	SOC_ENUM("HandsfreeL Playback Mux", twl4030_enum[6]),
+	SOC_ENUM("HandsfreeR Playback Mux", twl4030_enum[7]),
 };
 
 /* add non dapm controls */
-- 
1.6.0.3

  reply	other threads:[~2008-11-24 11:50 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-24 11:49 [PATCH 0/9] ASoC: TWL4030: Add mixer controls for outputs Peter Ujfalusi
2008-11-24 11:49 ` [PATCH 1/9] ASoC: TWL4030: Change the Master volume control to TLV Peter Ujfalusi
2008-11-24 11:49   ` [PATCH 2/9] ASoC: TWL4030: Add CGAIN volume control Peter Ujfalusi
2008-11-24 11:49     ` [PATCH 3/9] ASoC: TWL4030: Add helper function for mux handling Peter Ujfalusi
2008-11-24 11:49       ` [PATCH 4/9] ASoC: TWL4030: Add helper function for output gain controls Peter Ujfalusi
2008-11-24 11:49         ` [PATCH 5/9] ASoC: TWL4030: Add PreDriv outupt mux and volume controls Peter Ujfalusi
2008-11-24 11:49           ` [PATCH 6/9] ASoC: TWL4030: Add Headset " Peter Ujfalusi
2008-11-24 11:49             ` [PATCH 7/9] ASoC: TWL4030: Add Carkit " Peter Ujfalusi
2008-11-24 11:49               ` Peter Ujfalusi [this message]
2008-11-24 11:49                 ` [PATCH 9/9] ASoC: TWL4030: Add Earpiece " Peter Ujfalusi
2008-11-24 13:48           ` [PATCH 5/9] ASoC: TWL4030: Add PreDriv " Mark Brown
2008-11-24 14:19             ` Peter Ujfalusi
2008-11-24 14:50               ` Mark Brown
2008-11-25 10:51                 ` Peter Ujfalusi
2008-11-24 13:57         ` [PATCH 4/9] ASoC: TWL4030: Add helper function for output gain controls Mark Brown
2008-11-24 13:55     ` [PATCH 2/9] ASoC: TWL4030: Add CGAIN volume control Mark Brown
2008-11-24 13:55   ` [PATCH 1/9] ASoC: TWL4030: Change the Master volume control to TLV Mark Brown

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=1227527383-22516-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