ASoC: TWL4030: DAPM mapping of the Handsfree outputs

Adds DAPM muxing, routing for the Handsfree outputs.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 08c33e9b96cee278a025ab6ee804a4c3a2e4abe8..d0612a4ca456403cfc84ea419049c1358182bf2c 100644 (file)
--- 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"},