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

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

Merge "ASoC: wcd-mbhc: Add support for hph auto pull down"

parents 8221e331 a728decb

sound/soc/codecs/wcd-mbhc-v2.c

+8 −0
Original line number Diff line number Diff line
@@ -1160,6 +1160,10 @@ exit: 
	}

	if (mbhc->mbhc_cb->set_cap_mode)

		mbhc->mbhc_cb->set_cap_mode(codec, micbias1, micbias2);



	if (mbhc->mbhc_cb->hph_pull_down_ctrl)

		mbhc->mbhc_cb->hph_pull_down_ctrl(codec, true);



	mbhc->mbhc_cb->lock_sleep(mbhc, false);

	pr_debug("%s: leave\n", __func__);

}
@@ -1175,6 +1179,10 @@ static void wcd_mbhc_detect_plug_type(struct wcd_mbhc *mbhc) 


	pr_debug("%s: enter\n", __func__);

	WCD_MBHC_RSC_ASSERT_LOCKED(mbhc);



	if (mbhc->mbhc_cb->hph_pull_down_ctrl)

		mbhc->mbhc_cb->hph_pull_down_ctrl(codec, false);



	if (mbhc->mbhc_cb->micbias_enable_status)

		micbias1 = mbhc->mbhc_cb->micbias_enable_status(mbhc,

								MIC_BIAS_1);

sound/soc/codecs/wcd-mbhc-v2.h

+1 −0
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@ struct wcd_mbhc_cb { 
	bool (*extn_use_mb)(struct snd_soc_codec *);

	int (*mbhc_micb_ctrl_thr_mic)(struct snd_soc_codec *, int, bool);

	void (*mbhc_gnd_det_ctrl)(struct snd_soc_codec *, bool);

	void (*hph_pull_down_ctrl)(struct snd_soc_codec *, bool);

};



struct wcd_mbhc {