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

Commit e55d0fcb authored by Vatsal Bucha's avatar Vatsal Bucha Committed by Gerrit - the friendly Code Review server
Browse files

ASoC: wcd938x: Reduce glitch during headset record 



Enable ADC Mode and tx channel cfg as part of enable_adc.
This should be enabled before enabling bolero dec so as
to reduce glitch or saturation for headset.

Change-Id: I94045d0c3b7b96744afb9e6a9a3eecf0abc5a55f
Signed-off-by: default avatarVatsal Bucha <vbucha@codeaurora.org>
parent 686ed22e

asoc/codecs/wcd938x/wcd938x.c

+69 −70
Original line number Diff line number Diff line
@@ -1591,69 +1591,6 @@ static int wcd938x_get_adc_mode(int val) 
	return ret;

}



static int wcd938x_codec_enable_adc(struct snd_soc_dapm_widget *w,

				    struct snd_kcontrol *kcontrol,

				    int event){

	struct snd_soc_component *component =

					snd_soc_dapm_to_component(w->dapm);

	struct wcd938x_priv *wcd938x = snd_soc_component_get_drvdata(component);

	int clk_rate = 0;



	dev_dbg(component->dev, "%s wname: %s event: %d\n", __func__,

		w->name, event);



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_CDC_ANA_CLK_CTL, 0x08, 0x08);

		snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_CDC_ANA_CLK_CTL, 0x10, 0x10);

		set_bit(w->shift, &wcd938x->status_mask);

		clk_rate = wcd938x_get_clk_rate(wcd938x->tx_mode[w->shift]);

		/* Enable BCS for Headset mic */

		if (w->shift == 1 && !(snd_soc_component_read32(component,

				WCD938X_TX_NEW_AMIC_MUX_CFG) & 0x80)) {

			if (!wcd938x->bcs_dis)

				wcd938x_tx_connect_port(component, MBHC,

						SWR_CLK_RATE_4P8MHZ, true);

			set_bit(AMIC2_BCS_ENABLE, &wcd938x->status_mask);

		}

		wcd938x_tx_connect_port(component, ADC1 + (w->shift), clk_rate,

					true);

		break;

	case SND_SOC_DAPM_POST_PMD:

		wcd938x_tx_connect_port(component, ADC1 + (w->shift), 0, false);

		if (w->shift == 1 &&

			test_bit(AMIC2_BCS_ENABLE, &wcd938x->status_mask)) {

			if (!wcd938x->bcs_dis)

				wcd938x_tx_connect_port(component, MBHC, 0,

							false);

			clear_bit(AMIC2_BCS_ENABLE, &wcd938x->status_mask);

		}

		snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_CDC_ANA_CLK_CTL, 0x08, 0x00);

		clear_bit(w->shift, &wcd938x->status_mask);

		break;

	};



	return 0;

}



void wcd938x_disable_bcs_before_slow_insert(struct snd_soc_component *component,

					    bool bcs_disable)

{

	struct wcd938x_priv *wcd938x = snd_soc_component_get_drvdata(component);



	if (wcd938x->update_wcd_event) {

		if (bcs_disable)

			wcd938x->update_wcd_event(wcd938x->handle,

						WCD_BOLERO_EVT_BCS_CLK_OFF, 0);

		else

			wcd938x->update_wcd_event(wcd938x->handle,

						WCD_BOLERO_EVT_BCS_CLK_OFF, 1);

	}

}



int wcd938x_tx_channel_config(struct snd_soc_component *component,

			      int channel, int mode)

{
@@ -1694,14 +1631,14 @@ int wcd938x_tx_channel_config(struct snd_soc_component *component, 
	return ret;

}



static int wcd938x_enable_req(struct snd_soc_dapm_widget *w,

			      struct snd_kcontrol *kcontrol, int event)

{

static int wcd938x_codec_enable_adc(struct snd_soc_dapm_widget *w,

				    struct snd_kcontrol *kcontrol,

				    int event){

	struct snd_soc_component *component =

					snd_soc_dapm_to_component(w->dapm);

	int mode;

	int ret = 0;

	struct wcd938x_priv *wcd938x = snd_soc_component_get_drvdata(component);

	int clk_rate = 0, mode;

	int ret = 0;



	dev_dbg(component->dev, "%s wname: %s event: %d\n", __func__,

		w->name, event);
@@ -1709,9 +1646,21 @@ static int wcd938x_enable_req(struct snd_soc_dapm_widget *w, 
	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_CDC_REQ_CTL, 0x02, 0x02);

				WCD938X_DIGITAL_CDC_ANA_CLK_CTL, 0x08, 0x08);

		snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_CDC_REQ_CTL, 0x01, 0x00);

				WCD938X_DIGITAL_CDC_ANA_CLK_CTL, 0x10, 0x10);

		set_bit(w->shift, &wcd938x->status_mask);

		clk_rate = wcd938x_get_clk_rate(wcd938x->tx_mode[w->shift]);

		/* Enable BCS for Headset mic */

		if (w->shift == 1 && !(snd_soc_component_read32(component,

				WCD938X_TX_NEW_AMIC_MUX_CFG) & 0x80)) {

			if (!wcd938x->bcs_dis)

				wcd938x_tx_connect_port(component, MBHC,

						SWR_CLK_RATE_4P8MHZ, true);

			set_bit(AMIC2_BCS_ENABLE, &wcd938x->status_mask);

		}

		wcd938x_tx_connect_port(component, ADC1 + (w->shift), clk_rate,

					true);

		ret = wcd938x_tx_channel_config(component, w->shift, 1);

		mode = wcd938x_get_adc_mode(wcd938x->tx_mode[w->shift]);

		if (mode < 0) {
@@ -1787,6 +1736,56 @@ static int wcd938x_enable_req(struct snd_soc_dapm_widget *w, 
		default:

			break;

		}

		wcd938x_tx_connect_port(component, ADC1 + (w->shift), 0, false);

		if (w->shift == 1 &&

			test_bit(AMIC2_BCS_ENABLE, &wcd938x->status_mask)) {

			if (!wcd938x->bcs_dis)

				wcd938x_tx_connect_port(component, MBHC, 0,

							false);

			clear_bit(AMIC2_BCS_ENABLE, &wcd938x->status_mask);

		}

		snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_CDC_ANA_CLK_CTL, 0x08, 0x00);

		clear_bit(w->shift, &wcd938x->status_mask);

		break;

	};



	return 0;

}



void wcd938x_disable_bcs_before_slow_insert(struct snd_soc_component *component,

					    bool bcs_disable)

{

	struct wcd938x_priv *wcd938x = snd_soc_component_get_drvdata(component);



	if (wcd938x->update_wcd_event) {

		if (bcs_disable)

			wcd938x->update_wcd_event(wcd938x->handle,

						WCD_BOLERO_EVT_BCS_CLK_OFF, 0);

		else

			wcd938x->update_wcd_event(wcd938x->handle,

						WCD_BOLERO_EVT_BCS_CLK_OFF, 1);

	}

}



static int wcd938x_enable_req(struct snd_soc_dapm_widget *w,

			      struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_component *component =

					snd_soc_dapm_to_component(w->dapm);

	int ret = 0;



	dev_dbg(component->dev, "%s wname: %s event: %d\n", __func__,

		w->name, event);



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_CDC_REQ_CTL, 0x02, 0x02);

		snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_CDC_REQ_CTL, 0x01, 0x00);

		break;

	case SND_SOC_DAPM_POST_PMD:

		snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_CDC_ANA_CLK_CTL, 0x10, 0x00);

		break;