1 files changed, 30 insertions, 4 deletions

diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 13773028f6f1..51848880504a 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -322,6 +322,30 @@ static int outmixer_event(struct snd_soc_dapm_widget *w,
         return ret;
 }
 
+static int handsfree_event(struct snd_soc_dapm_widget *w,
+                struct snd_kcontrol *kcontrol, int event)
+{
+        struct soc_enum *e = (struct soc_enum *)w->kcontrols->private_value;
+        unsigned char hs_ctl;
+
+        hs_ctl = twl4030_read_reg_cache(w->codec, e->reg);
+
+        if (hs_ctl & TWL4030_HF_CTL_REF_EN) {
+                hs_ctl |= TWL4030_HF_CTL_RAMP_EN;
+                twl4030_write(w->codec, e->reg, hs_ctl);
+                hs_ctl |= TWL4030_HF_CTL_LOOP_EN;
+                twl4030_write(w->codec, e->reg, hs_ctl);
+                hs_ctl |= TWL4030_HF_CTL_HB_EN;
+                twl4030_write(w->codec, e->reg, hs_ctl);
+        } else {
+                hs_ctl &= ~(TWL4030_HF_CTL_RAMP_EN | TWL4030_HF_CTL_LOOP_EN
+                                | TWL4030_HF_CTL_HB_EN);
+                twl4030_write(w->codec, e->reg, hs_ctl);
+        }
+
+        return 0;
+}
+
 /*
  * Some of the gain controls in TWL (mostly those which are associated with
  * the outputs) are implemented in an interesting way:
@@ -806,10 +830,12 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {
         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_MUX_E("HandsfreeL Mux", TWL4030_REG_HFL_CTL, 5, 0,
+                &twl4030_dapm_handsfreel_control, handsfree_event,
+                SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD),
+        SND_SOC_DAPM_MUX_E("HandsfreeR Mux", TWL4030_REG_HFR_CTL, 5, 0,
+                &twl4030_dapm_handsfreer_control, handsfree_event,
+                SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD),
 
         SND_SOC_DAPM_ADC("ADCL", "Left Capture", SND_SOC_NOPM, 0, 0),
         SND_SOC_DAPM_ADC("ADCR", "Right Capture", SND_SOC_NOPM, 0, 0),