From a77e386d54b081bc135845552eeb6b03c6881da7 Mon Sep 17 00:00:00 2001 From: Vignesh Kulothungan Date: Fri, 18 Sep 2020 13:12:52 -0700 Subject: [PATCH] Revert "ASoC: codecs: handle device disconnect during SSR" This reverts commit 75f229237a51f8c0de070cbcc560f383de176215. Change-Id: Ie37d6ac80a3f86df50cdaab65dfd51624f7c7517 Signed-off-by: Vignesh Kulothungan --- asoc/codecs/wcd-mbhc-v2.c | 19 ------------------- asoc/codecs/wcd938x/wcd938x.c | 2 -- include/asoc/wcd-mbhc-v2.h | 1 - 3 files changed, 22 deletions(-) diff --git a/asoc/codecs/wcd-mbhc-v2.c b/asoc/codecs/wcd-mbhc-v2.c index 3194724ee2..fad70448e9 100644 --- a/asoc/codecs/wcd-mbhc-v2.c +++ b/asoc/codecs/wcd-mbhc-v2.c @@ -1630,8 +1630,6 @@ static int wcd_mbhc_set_keycode(struct wcd_mbhc *mbhc) static int wcd_mbhc_usbc_ana_event_handler(struct notifier_block *nb, unsigned long mode, void *ptr) { - unsigned int l_det_en = 0; - unsigned int detection_type = 0; struct wcd_mbhc *mbhc = container_of(nb, struct wcd_mbhc, fsa_nb); if (!mbhc) @@ -1644,23 +1642,6 @@ static int wcd_mbhc_usbc_ana_event_handler(struct notifier_block *nb, mbhc->mbhc_cb->clk_setup(mbhc->component, true); /* insertion detected, enable L_DET_EN */ WCD_MBHC_REG_UPDATE_BITS(WCD_MBHC_L_DET_EN, 1); - } else { - WCD_MBHC_REG_READ(WCD_MBHC_MECH_DETECTION_TYPE, detection_type); - WCD_MBHC_REG_READ(WCD_MBHC_L_DET_EN, l_det_en); - /* If both l_det_en and detection type are set, it means device was - * unplugged during SSR and detection interrupt was not handled. - * So trigger device disconnect */ - if (detection_type && l_det_en) { - /* Set the detection type appropriately */ - WCD_MBHC_REG_UPDATE_BITS(WCD_MBHC_MECH_DETECTION_TYPE, - !detection_type); - /* Set current plug type to the state before SSR */ - mbhc->current_plug = mbhc->plug_before_ssr; - - wcd_mbhc_swch_irq_handler(mbhc); - mbhc->mbhc_cb->lock_sleep(mbhc, false); - mbhc->plug_before_ssr = MBHC_PLUG_TYPE_NONE; - } } return 0; } diff --git a/asoc/codecs/wcd938x/wcd938x.c b/asoc/codecs/wcd938x/wcd938x.c index 2497980953..96e269914d 100644 --- a/asoc/codecs/wcd938x/wcd938x.c +++ b/asoc/codecs/wcd938x/wcd938x.c @@ -2156,8 +2156,6 @@ static int wcd938x_event_notify(struct notifier_block *block, WCD938X_EVT_SSR_DOWN, NULL); wcd938x->mbhc->wcd_mbhc.deinit_in_progress = true; - wcd938x->mbhc->wcd_mbhc.plug_before_ssr = - wcd938x->mbhc->wcd_mbhc.current_plug; mbhc = &wcd938x->mbhc->wcd_mbhc; wcd938x->usbc_hs_status = get_usbc_hs_status(component, mbhc->mbhc_cfg); diff --git a/include/asoc/wcd-mbhc-v2.h b/include/asoc/wcd-mbhc-v2.h index e9dd2ae165..1c351f8012 100644 --- a/include/asoc/wcd-mbhc-v2.h +++ b/include/asoc/wcd-mbhc-v2.h @@ -551,7 +551,6 @@ struct wcd_mbhc { wait_queue_head_t wait_btn_press; bool is_btn_press; u8 current_plug; - u8 plug_before_ssr; bool in_swch_irq_handler; bool hphl_swh; /*track HPHL switch NC / NO */ bool gnd_swh; /*track GND switch NC / NO */