summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVatsal Bucha <vbucha@codeaurora.org>2019-09-11 12:17:11 +0530
committerVincent Tew <vincenttew@google.com>2020-11-23 08:01:48 +0000
commit2bf87c22b74af38c2aca4c376b71734a7374902c (patch)
tree3808b86a39242c0e3aa36123e14aa3a9376d4ac2
parentf49c717db2d431ea5878f72f5f696f4b803ea3c2 (diff)
downloadmsm-extra-2bf87c22b74af38c2aca4c376b71734a7374902c.tar.gz
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. Bug: 171289750 Change-Id: If73bbe2cd78d04d1fcb359a3e5ed5cd69f3ab9f0 Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org> Signed-off-by: vincenttew <vincenttew@google.com>
-rw-r--r--asoc/codecs/wcd-mbhc-v2.c6
-rw-r--r--asoc/codecs/wcd-mbhc-v2.h1
2 files changed, 2 insertions, 5 deletions
diff --git a/asoc/codecs/wcd-mbhc-v2.c b/asoc/codecs/wcd-mbhc-v2.c
index 42ab7c80..77dfa3c1 100644
--- a/asoc/codecs/wcd-mbhc-v2.c
+++ b/asoc/codecs/wcd-mbhc-v2.c
@@ -711,10 +711,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/asoc/codecs/wcd-mbhc-v2.h b/asoc/codecs/wcd-mbhc-v2.h
index 7ddd92f0..36a41ddf 100644
--- a/asoc/codecs/wcd-mbhc-v2.h
+++ b/asoc/codecs/wcd-mbhc-v2.h
@@ -148,7 +148,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