From cd339694c5d9e720d73cecd057837b0a3a497b62 Mon Sep 17 00:00:00 2001 From: Vatsal Bucha Date: Wed, 11 Sep 2019 12:17:11 +0530 Subject: [PATCH] ASoC: wcd-mbhc: Remove max impedance limit for lineout detection Max limit of 60k ohms was set for cable to be detected as lineout to fix headset detected as lineout issue on legacy targets. This was because of large impedance detected for headset. This is not applicable for adc based targets as headset is detected based on mic adc voltage. Remove max impedance limit for lineout detection. Change-Id: If73bbe2cd78d04d1fcb359a3e5ed5cd69f3ab9f0 Signed-off-by: Vatsal Bucha --- asoc/codecs/wcd-mbhc-v2.c | 6 ++---- include/asoc/wcd-mbhc-v2.h | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/asoc/codecs/wcd-mbhc-v2.c b/asoc/codecs/wcd-mbhc-v2.c index 624b59af069e..01544aab9c43 100644 --- a/asoc/codecs/wcd-mbhc-v2.c +++ b/asoc/codecs/wcd-mbhc-v2.c @@ -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; diff --git a/include/asoc/wcd-mbhc-v2.h b/include/asoc/wcd-mbhc-v2.h index 9341e3d3c784..1f9d64e3ba23 100644 --- a/include/asoc/wcd-mbhc-v2.h +++ b/include/asoc/wcd-mbhc-v2.h @@ -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