mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 06:03:36 -04:00
Merge "ASoC: wcd-mbhc: Remove max impedance limit for lineout detection"
This commit is contained in:
commit
59139d3262
2 changed files with 2 additions and 5 deletions
|
|
@ -691,10 +691,8 @@ void wcd_mbhc_report_plug(struct wcd_mbhc *mbhc, int insertion,
|
|||
&mbhc->zl, &mbhc->zr);
|
||||
WCD_MBHC_REG_UPDATE_BITS(WCD_MBHC_FSM_EN,
|
||||
fsm_en);
|
||||
if ((mbhc->zl > mbhc->mbhc_cfg->linein_th &&
|
||||
mbhc->zl < MAX_IMPED) &&
|
||||
(mbhc->zr > mbhc->mbhc_cfg->linein_th &&
|
||||
mbhc->zr < MAX_IMPED) &&
|
||||
if ((mbhc->zl > mbhc->mbhc_cfg->linein_th) &&
|
||||
(mbhc->zr > mbhc->mbhc_cfg->linein_th) &&
|
||||
(jack_type == SND_JACK_HEADPHONE)) {
|
||||
jack_type = SND_JACK_LINEOUT;
|
||||
mbhc->force_linein = true;
|
||||
|
|
|
|||
|
|
@ -140,7 +140,6 @@ do { \
|
|||
#define FW_READ_ATTEMPTS 15
|
||||
#define FW_READ_TIMEOUT 4000000
|
||||
#define FAKE_REM_RETRY_ATTEMPTS 3
|
||||
#define MAX_IMPED 60000
|
||||
|
||||
#define WCD_MBHC_BTN_PRESS_COMPL_TIMEOUT_MS 50
|
||||
#define ANC_DETECT_RETRY_CNT 7
|
||||
|
|
|
|||
Loading…
Reference in a new issue