samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: wcd: Avoid multiple insertion/removals for aux cable

Browse Source 
High impedance aux cable when inserted causes jack to change to
lineout. This causes removal event to be called which results
in pause during music playback because jack value is not updated.
Do not change current plug while plug is marked as lineout.

CRs-Fixed: 2151012
Change-Id: I99797b58c48be00185a352094e32e8623faee491
Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
This commit is contained in:
Vatsal Bucha
2017-12-12 14:22:31 +05:30
committed by Gerrit - the friendly Code Review server
parent 18d2731639
commit d6d62b8d3c
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
asoc/codecs/wcd-mbhc-legacy.c
View File

@@ -688,7 +688,11 @@ correct_plug_type:
if (!wrk_complete && mbhc->btn_press_intr) { if (!wrk_complete && mbhc->btn_press_intr) {
pr_debug("%s: Can be slow insertion of headphone\n", __func__); pr_debug("%s: Can be slow insertion of headphone\n", __func__);
wcd_cancel_btn_work(mbhc); wcd_cancel_btn_work(mbhc);
plug_type = MBHC_PLUG_TYPE_HEADPHONE; /* Report as headphone only if previously
* not reported as lineout
*/
if (!mbhc->force_linein)
plug_type = MBHC_PLUG_TYPE_HEADPHONE;
} }
/* /*
* If plug_tye is headset, we might have already reported either in * If plug_tye is headset, we might have already reported either in

3
asoc/codecs/wcd-mbhc-v2.c
View File

@@ -605,6 +605,7 @@ void wcd_mbhc_report_plug(struct wcd_mbhc *mbhc, int insertion,
hphrocp_off_report(mbhc, SND_JACK_OC_HPHR); hphrocp_off_report(mbhc, SND_JACK_OC_HPHR);
hphlocp_off_report(mbhc, SND_JACK_OC_HPHL); hphlocp_off_report(mbhc, SND_JACK_OC_HPHL);
mbhc->current_plug = MBHC_PLUG_TYPE_NONE; mbhc->current_plug = MBHC_PLUG_TYPE_NONE;
mbhc->force_linein = false;
} else { } else {
/* /*
* Report removal of current jack type. * Report removal of current jack type.
@@ -657,6 +658,7 @@ void wcd_mbhc_report_plug(struct wcd_mbhc *mbhc, int insertion,
SND_JACK_LINEOUT | SND_JACK_LINEOUT |
SND_JACK_ANC_HEADPHONE | SND_JACK_ANC_HEADPHONE |
SND_JACK_UNSUPPORTED); SND_JACK_UNSUPPORTED);
mbhc->force_linein = false;
} }
if (mbhc->current_plug == MBHC_PLUG_TYPE_HEADSET && if (mbhc->current_plug == MBHC_PLUG_TYPE_HEADSET &&
@@ -699,6 +701,7 @@ void wcd_mbhc_report_plug(struct wcd_mbhc *mbhc, int insertion,
mbhc->zr < MAX_IMPED) && mbhc->zr < MAX_IMPED) &&
(jack_type == SND_JACK_HEADPHONE)) { (jack_type == SND_JACK_HEADPHONE)) {
jack_type = SND_JACK_LINEOUT; jack_type = SND_JACK_LINEOUT;
mbhc->force_linein = true;
mbhc->current_plug = MBHC_PLUG_TYPE_HIGH_HPH; mbhc->current_plug = MBHC_PLUG_TYPE_HIGH_HPH;
if (mbhc->hph_status) { if (mbhc->hph_status) {
mbhc->hph_status &= ~(SND_JACK_HEADSET | mbhc->hph_status &= ~(SND_JACK_HEADSET |

1
asoc/codecs/wcd-mbhc-v2.h
View File

@@ -589,6 +589,7 @@ struct wcd_mbhc {
struct work_struct usbc_analog_work; struct work_struct usbc_analog_work;
struct wcd_mbhc_fn *mbhc_fn; struct wcd_mbhc_fn *mbhc_fn;
bool force_linein;
}; };
void wcd_mbhc_find_plug_and_report(struct wcd_mbhc *mbhc, void wcd_mbhc_find_plug_and_report(struct wcd_mbhc *mbhc,