diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-23 09:44:29 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-23 09:44:29 -0700 |
| commit | 3535fcdc1bf4d1ba37d125c56075c866e70e8599 (patch) | |
| tree | 9c0ed78e8bf4f9dd1548b6289483ced15ce576a7 | |
| parent | 0776e27963383f39de8a586db52a8d01a868081f (diff) | |
| parent | 1650f182b686187e500075fbf970b7494515a7e9 (diff) | |
Merge "ASoC: sdm660_cdc: Fix no headset remove event after SSR"
| -rw-r--r-- | sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c b/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c index 04440262fe7a..c647549be07d 100644 --- a/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c +++ b/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c @@ -3797,6 +3797,9 @@ static int msm_anlg_cdc_device_up(struct snd_soc_codec *codec) msm_anlg_cdc_configure_cap(codec, false, false); wcd_mbhc_stop(&sdm660_cdc_priv->mbhc); wcd_mbhc_deinit(&sdm660_cdc_priv->mbhc); + /* Disable mechanical detection and set type to insertion */ + snd_soc_update_bits(codec, MSM89XX_PMIC_ANALOG_MBHC_DET_CTL_1, + 0xA0, 0x20); ret = wcd_mbhc_init(&sdm660_cdc_priv->mbhc, codec, &mbhc_cb, &intr_ids, wcd_mbhc_registers, true); if (ret) |