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

Commit 00847296 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: wcd9xxx: Handle fake mechanical interrupt"

parents e3c8291c 57b17f33

sound/soc/codecs/wcd9xxx-mbhc.c

+5 −6
Original line number Diff line number Diff line
@@ -3114,7 +3114,6 @@ static void wcd9xxx_correct_swch_plug(struct work_struct *work) 


	mbhc = container_of(work, struct wcd9xxx_mbhc, correct_plug_swch);

	codec = mbhc->codec;

	mbhc->poll_swch_on = true;



	current_source_enable = (((mbhc->mbhc_cfg->cs_enable_flags &

		      (1 << MBHC_CS_ENABLE_POLLING)) != 0) &&
@@ -3293,7 +3292,6 @@ static void wcd9xxx_correct_swch_plug(struct work_struct *work) 
		WCD9XXX_BCL_UNLOCK(mbhc->resmgr);

	}

	pr_debug("%s: leave current_plug(%d)\n", __func__, mbhc->current_plug);

	mbhc->poll_swch_on = false;

	/* unlock sleep */

	wcd9xxx_unlock_sleep(mbhc->resmgr->core_res);

}
@@ -3321,8 +3319,6 @@ static void wcd9xxx_swch_irq_handler(struct wcd9xxx_mbhc *mbhc) 
	pr_debug("%s: Current plug type %d, insert %d\n", __func__,

		 mbhc->current_plug, insert);

	if ((mbhc->current_plug == PLUG_TYPE_NONE) && insert) {

		if (mbhc->poll_swch_on)

			goto exit;



		mbhc->lpi_enabled = false;

		wmb();
@@ -3331,9 +3327,13 @@ static void wcd9xxx_swch_irq_handler(struct wcd9xxx_mbhc *mbhc) 
				      &mbhc->correct_plug_swch);



		if ((mbhc->current_plug != PLUG_TYPE_NONE) &&

		    (mbhc->current_plug != PLUG_TYPE_HIGH_HPH) &&

		    !(snd_soc_read(codec, WCD9XXX_A_MBHC_INSERT_DETECT) &

				   (1 << 1)))

				   (1 << 1))) {

			pr_debug("%s: current plug: %d\n", __func__,

				mbhc->current_plug);

			goto exit;

		}



		/* Disable Mic Bias pull down and HPH Switch to GND */

		snd_soc_update_bits(codec, mbhc->mbhc_bias_regs.ctl_reg, 0x01,
@@ -5368,7 +5368,6 @@ int wcd9xxx_mbhc_init(struct wcd9xxx_mbhc *mbhc, struct wcd9xxx_resmgr *resmgr, 
	mbhc->current_plug = PLUG_TYPE_NONE;

	mbhc->lpi_enabled = false;

	mbhc->no_mic_headset_override = false;

	mbhc->poll_swch_on = false;

	mbhc->mbhc_last_resume = 0;

	mbhc->codec = codec;

	mbhc->resmgr = resmgr;

sound/soc/codecs/wcd9xxx-mbhc.h

+0 −1
Original line number Diff line number Diff line
@@ -343,7 +343,6 @@ struct wcd9xxx_mbhc { 
	u8 hphlocp_cnt; /* headphone left ocp retry */

	u8 hphrocp_cnt; /* headphone right ocp retry */



	bool poll_swch_on;

	/* Work to perform MBHC Firmware Read */

	struct delayed_work mbhc_firmware_dwork;

	const struct firmware *mbhc_fw;