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

Commit c59bbd21 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: compute impedance value for headset"

parents 288c9101 0f167789

sound/soc/codecs/msm8x16-wcd.c

+23 −1
Original line number Diff line number Diff line
@@ -178,9 +178,31 @@ static void *modem_state_notifier; 


static struct snd_soc_codec *registered_codec;



static void msm8x16_wcd_compute_impedance(s16 l, s16 r, uint32_t *zl,

				uint32_t *zr, bool high)

{

	int64_t rl = 0, rr = 0;



	if (high) {

		pr_debug("%s: This plug has high range impedance",

			  __func__);

		rl = (int)(10*(l*400 - 200))/12;

		rr = (int)(10*(r*400 - 200))/12;

	} else {

		pr_debug("%s: This plug has low range impedance",

			__func__);

		rl = (int)(10*(l*2 - 1))/12;

		rr = (int)(10*(r*2 - 1))/12;

	}



	*zl = rl;

	*zr = rr;

}



static const struct wcd_mbhc_cb mbhc_cb = {

	.enable_mb_source = msm8x16_wcd_enable_ext_mb_source,

	.trim_btn_reg = msm8x16_trim_btn_reg,

	.compute_impedance = msm8x16_wcd_compute_impedance,

};



int msm8x16_unregister_notifier(struct snd_soc_codec *codec,
@@ -3340,7 +3362,7 @@ static int msm8x16_wcd_codec_probe(struct snd_soc_codec *codec) 
	BLOCKING_INIT_NOTIFIER_HEAD(&msm8x16_wcd_priv->notifier);



	wcd_mbhc_init(&msm8x16_wcd_priv->mbhc, codec, &mbhc_cb, &intr_ids,

			false);

			true);



	msm8x16_wcd_priv->mclk_enabled = false;

	msm8x16_wcd_priv->clock_active = false;

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

+38 −20
Original line number Diff line number Diff line
@@ -389,27 +389,42 @@ static void wcd_mbhc_calc_impedance(struct wcd_mbhc *mbhc, uint32_t *zl, 
	uint32_t *zr)

{

	struct snd_soc_codec *codec = mbhc->codec;

	u16 impedance_l, impedance_r;

	u16 impedance_l_fixed;

	s16 reg0, reg1;

	s16 impedance_l, impedance_r;

	s16 impedance_l_fixed;

	s16 reg0, reg1, reg2;

	bool high = false;



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



	WCD_MBHC_RSC_ASSERT_LOCKED(mbhc);

	reg0 = snd_soc_read(codec, MSM8X16_WCD_A_ANALOG_MASTER_BIAS_CTL);

	reg1 = snd_soc_read(codec, MSM8X16_WCD_A_ANALOG_MICB_1_EN);

	/* enable master bias */

	snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_MASTER_BIAS_CTL,

			0x30, 0x30);

	/* enable mic bias */

	snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_MICB_1_EN,

			0x06, 0x04);

	reg0 = snd_soc_read(codec, MSM8X16_WCD_A_ANALOG_MBHC_DBNC_TIMER);

	reg1 = snd_soc_read(codec, MSM8X16_WCD_A_ANALOG_MBHC_BTN2_ZDETH_CTL);

	reg2 = snd_soc_read(codec, MSM8X16_WCD_A_ANALOG_MBHC_DET_CTL_2);



	/* disable FSM */

	snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_MBHC_FSM_CTL,

			0x80, 0x00);

	/*

	 * Enable legacy electrical detection current sources

	 * and disable fast ramp and enable manual switching

	 * of extra capacitance

	 */

	pr_debug("%s: Setup for impedance det\n", __func__);



	snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_MBHC_DET_CTL_2,

			0x06, 0x02);

	snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_MBHC_DBNC_TIMER,

			0x02, 0x02);

	snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_MBHC_BTN2_ZDETH_CTL,

			0x20, 0x00);



	pr_debug("%s: Start performing impedance detection\n",

		 __func__);



	/* Enable ZDET_L_MEAS_EN */

	snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_MBHC_FSM_CTL,
@@ -428,8 +443,10 @@ static void wcd_mbhc_calc_impedance(struct wcd_mbhc *mbhc, uint32_t *zl, 
			MSM8X16_WCD_A_ANALOG_MBHC_FSM_CTL,

			0x04, 0x00);



	if (impedance_l > 1)

	if (impedance_l > 1) {

		high = true;

		goto exit;

	}



	/*

	 * As the result is 0 impedance is < 200 use
@@ -476,10 +493,10 @@ static void wcd_mbhc_calc_impedance(struct wcd_mbhc *mbhc, uint32_t *zl, 
		snd_soc_update_bits(codec,

				MSM8X16_WCD_A_ANALOG_MBHC_FSM_CTL,

				0x02, 0x00);

		usleep_range(40000, 40100);

		snd_soc_update_bits(codec,

				MSM8X16_WCD_A_ANALOG_MBHC_BTN0_ZDETL_CTL,

				0x03, 0x00);

		usleep_range(40000, 40100);

		goto exit;

	}
@@ -545,11 +562,12 @@ exit: 
	snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_MBHC_FSM_CTL,

			0xFF, 0xB0);

	/* write back Master Bias and mic_bias registers */

	snd_soc_write(codec, MSM8X16_WCD_A_ANALOG_MICB_1_EN, reg1);

	snd_soc_write(codec, MSM8X16_WCD_A_ANALOG_MASTER_BIAS_CTL, reg0);

	*zl = impedance_l;

	*zr = impedance_r;

	snd_soc_write(codec, MSM8X16_WCD_A_ANALOG_MBHC_BTN2_ZDETH_CTL, reg1);

	snd_soc_write(codec, MSM8X16_WCD_A_ANALOG_MBHC_DBNC_TIMER, reg0);

	snd_soc_write(codec, MSM8X16_WCD_A_ANALOG_MBHC_DET_CTL_2, reg2);

	mbhc->mbhc_cb->compute_impedance(impedance_l, impedance_r,

					 zl, zr, high);



	pr_debug("%s: RL %d milliohm, RR %d milliohm\n", __func__, *zl, *zr);

	pr_debug("%s: Impedance detection completed\n", __func__);

}

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

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ struct wcd_mbhc_intr { 
struct wcd_mbhc_cb {

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

	void (*trim_btn_reg) (struct snd_soc_codec *);

	void (*compute_impedance) (s16 , s16 , uint32_t *, uint32_t *, bool);

};



struct wcd_mbhc {