Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59139d32 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: wcd-mbhc: Remove max impedance limit for lineout detection"

parents cd5eb95e cd339694

asoc/codecs/wcd-mbhc-v2.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

include/asoc/wcd-mbhc-v2.h

+0 −1
Original line number Diff line number Diff line
@@ -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