diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-07 03:21:41 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-07 03:21:41 -0700 |
| commit | 894d547ff7ac03fb4dd46c4400171d700f2b306d (patch) | |
| tree | 3974ddb3178bc8ff1b3a20b3aa5e9788ed7a2751 | |
| parent | 11d6060fffff4b7e87d1cadb5f65dfc7f74332cc (diff) | |
| parent | 37545170e3491ee9a670b6ebef6f0be5fecf12cd (diff) | |
Merge "ASoC: wcd-mbhc: disable fake electrical interrupts"
| -rw-r--r-- | sound/soc/codecs/wcd-mbhc-v2.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/codecs/wcd-mbhc-v2.c b/sound/soc/codecs/wcd-mbhc-v2.c index 60a7ad1b01c2..5b6af14e1d94 100644 --- a/sound/soc/codecs/wcd-mbhc-v2.c +++ b/sound/soc/codecs/wcd-mbhc-v2.c @@ -1545,6 +1545,13 @@ static void wcd_mbhc_swch_irq_handler(struct wcd_mbhc *mbhc) mbhc->btn_press_intr = false; if (mbhc->current_plug == MBHC_PLUG_TYPE_HEADPHONE) { + wcd_mbhc_hs_elec_irq(mbhc, WCD_MBHC_ELEC_HS_REM, + false); + wcd_mbhc_hs_elec_irq(mbhc, WCD_MBHC_ELEC_HS_INS, + false); + WCD_MBHC_REG_UPDATE_BITS(WCD_MBHC_ELECT_DETECTION_TYPE, + 1); + WCD_MBHC_REG_UPDATE_BITS(WCD_MBHC_ELECT_SCHMT_ISRC, 0); wcd_mbhc_report_plug(mbhc, 0, SND_JACK_HEADPHONE); } else if (mbhc->current_plug == MBHC_PLUG_TYPE_GND_MIC_SWAP) { wcd_mbhc_report_plug(mbhc, 0, SND_JACK_UNSUPPORTED); |