This patch adds the routing selection for the Hands-free output.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
---
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
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
