From 81c4cb937b97826182c472e01004679a0383a6fe Mon Sep 17 00:00:00 2001 From: yaozm1 Date: Wed, 27 May 2020 11:02:30 +0800 Subject: [PATCH] asoc:Enable necessary log for mbhc Propogate changes from (CR). For headset debug purpose; Enable necessary log. Change-Id: Ib34f66978a7659ca396ef6db4d0a8e5f18363bd4 Signed-off-by: yaozm1 Reviewed-on: https://gerrit.mot.com/1581555 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key (cherry picked from commit 08300c96a3e1454a6c8e2de9df5a3df69ecc1776) Reviewed-on: https://gerrit.mot.com/1744665 Reviewed-by: Yunfei Guo Reviewed-by: Wang Wang --- asoc/codecs/wcd-mbhc-v2.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/asoc/codecs/wcd-mbhc-v2.c b/asoc/codecs/wcd-mbhc-v2.c index ee24ea63a031..55cc0a37bd40 100644 --- a/asoc/codecs/wcd-mbhc-v2.c +++ b/asoc/codecs/wcd-mbhc-v2.c @@ -594,7 +594,7 @@ void wcd_mbhc_report_plug(struct wcd_mbhc *mbhc, int insertion, mbhc->hph_type = WCD_MBHC_HPH_NONE; mbhc->zl = mbhc->zr = 0; - pr_debug("%s: Reporting removal %d(%x)\n", __func__, + pr_info("%s: Reporting removal %d(%x)\n", __func__, jack_type, mbhc->hph_status); wcd_mbhc_jack_report(mbhc, &mbhc->headset_jack, mbhc->hph_status, WCD_MBHC_JACK_MASK); @@ -692,6 +692,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); + pr_info("%s,compute impedance,zl=%d,zr=%d\n", + __func__, mbhc->zl, mbhc->zr); if ((mbhc->zl > mbhc->mbhc_cfg->linein_th) && (mbhc->zr > mbhc->mbhc_cfg->linein_th) && (jack_type == SND_JACK_HEADPHONE)) { @@ -707,7 +709,7 @@ void wcd_mbhc_report_plug(struct wcd_mbhc *mbhc, int insertion, mbhc->hph_status, WCD_MBHC_JACK_MASK); } - pr_debug("%s: Marking jack type as SND_JACK_LINEOUT\n", + pr_info("%s: Marking jack type as SND_JACK_LINEOUT\n", __func__); } } @@ -737,7 +739,7 @@ void wcd_mbhc_report_plug(struct wcd_mbhc *mbhc, int insertion, mbhc->mbhc_cb->mbhc_micb_ramp_control) mbhc->mbhc_cb->mbhc_micb_ramp_control(component, false); - pr_debug("%s: Reporting insertion %d(%x)\n", __func__, + pr_info("%s: Reporting insertion %d(%x)\n", __func__, jack_type, mbhc->hph_status); wcd_mbhc_jack_report(mbhc, &mbhc->headset_jack, (mbhc->hph_status | SND_JACK_MECHANICAL), @@ -760,7 +762,7 @@ void wcd_mbhc_elec_hs_report_unplug(struct wcd_mbhc *mbhc) else pr_info("%s: hs_detect_plug work not cancelled\n", __func__); - pr_debug("%s: Report extension cable\n", __func__); + pr_info("%s: Report extension cable\n", __func__); wcd_mbhc_report_plug(mbhc, 1, SND_JACK_LINEOUT); /* * If PA is enabled HPHL schmitt trigger can @@ -1064,7 +1066,7 @@ static irqreturn_t wcd_mbhc_mech_plug_detect_irq(int irq, void *data) int r = IRQ_HANDLED; struct wcd_mbhc *mbhc = data; - pr_debug("%s: enter\n", __func__); + pr_info("%s: enter\n", __func__); if (mbhc == NULL) { pr_err("%s: NULL irq data\n", __func__); return IRQ_NONE; @@ -1247,7 +1249,7 @@ static irqreturn_t wcd_mbhc_release_handler(int irq, void *data) if (mbhc->buttons_pressed & WCD_MBHC_JACK_BUTTON_MASK) { ret = wcd_cancel_btn_work(mbhc); if (ret == 0) { - pr_debug("%s: Reporting long button release event\n", + pr_info("%s: Reporting long button release event\n", __func__); wcd_mbhc_jack_report(mbhc, &mbhc->button_jack, 0, mbhc->buttons_pressed); @@ -1256,8 +1258,8 @@ static irqreturn_t wcd_mbhc_release_handler(int irq, void *data) pr_debug("%s: Switch irq kicked in, ignore\n", __func__); } else { - pr_debug("%s: Reporting btn press\n", - __func__); + pr_info("%s: Reporting btn press %x\n", + __func__, mbhc->buttons_pressed); wcd_mbhc_jack_report(mbhc, &mbhc->button_jack, mbhc->buttons_pressed,