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

Commit 221d0664 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: codecs: wcd938x: cleanup TX recording sequence"

parents 5dcf7dd4 3edeac14

asoc/codecs/wcd938x/wcd938x.c

+60 −47
Original line number Diff line number Diff line
@@ -1385,7 +1385,6 @@ static int wcd938x_get_adc_mode(int val) 
static int wcd938x_codec_enable_adc(struct snd_soc_dapm_widget *w,

				    struct snd_kcontrol *kcontrol,

				    int event){

	int mode;

	struct snd_soc_component *component =

					snd_soc_dapm_to_component(w->dapm);

	struct wcd938x_priv *wcd938x = snd_soc_component_get_drvdata(component);
@@ -1395,43 +1394,10 @@ static int wcd938x_codec_enable_adc(struct snd_soc_dapm_widget *w, 


	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

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

		if (mode < 0) {

			dev_info(component->dev,

				 "%s: invalid mode, setting to normal mode\n",

				 __func__);

			mode = ADC_MODE_VAL_NORMAL;

		}

		snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_CDC_DIG_CLK_CTL, 0x80, 0x80);

		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);

		switch (w->shift) {

		case 0:

			snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_CDC_TX_ANA_MODE_0_1, 0x0F,

				mode);

			break;

		case 1:

			snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_CDC_TX_ANA_MODE_0_1, 0xF0,

				mode << 4);

			break;

		case 2:

			snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_CDC_TX_ANA_MODE_2_3, 0x0F,

				mode);

			break;

		case 3:

			snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_CDC_TX_ANA_MODE_2_3, 0xF0,

				mode << 4);

			break;

		default:

			break;

		}

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

		/* Enable BCS for Headset mic */

		if (w->shift == 1 && !(snd_soc_component_read32(component,
@@ -1502,7 +1468,9 @@ static int wcd938x_enable_req(struct snd_soc_dapm_widget *w, 
{

	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);



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

		w->name, event);
@@ -1514,26 +1482,71 @@ static int wcd938x_enable_req(struct snd_soc_dapm_widget *w, 
		snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_CDC_REQ_CTL, 0x01, 0x00);

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

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

		if (mode < 0) {

			dev_info(component->dev,

				 "%s: invalid mode, setting to normal mode\n",

				 __func__);

			mode = ADC_MODE_VAL_NORMAL;

		}

		switch (w->shift) {

		case 0:

			snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_CDC_DIG_CLK_CTL, 0x30, 0x30);

				WCD938X_DIGITAL_CDC_TX_ANA_MODE_0_1, 0x0F,

				mode);

			snd_soc_component_update_bits(component,

				WCD938X_ANA_TX_CH1, 0x80, 0x80);

				WCD938X_DIGITAL_CDC_DIG_CLK_CTL, 0x10, 0x10);

			break;

		case 1:

			snd_soc_component_update_bits(component,

				WCD938X_ANA_TX_CH2, 0x80, 0x80);

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

				WCD938X_DIGITAL_CDC_TX_ANA_MODE_0_1, 0xF0,

				mode << 4);

			snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_CDC_DIG_CLK_CTL, 0x20, 0x20);

			break;

	case SND_SOC_DAPM_POST_PMD:

		case 2:

			snd_soc_component_update_bits(component,

				WCD938X_ANA_TX_CH1, 0x80, 0x00);

				WCD938X_DIGITAL_CDC_TX_ANA_MODE_2_3, 0x0F,

				mode);

			snd_soc_component_update_bits(component,

				WCD938X_ANA_TX_CH2, 0x80, 0x00);

				WCD938X_DIGITAL_CDC_DIG_CLK_CTL, 0x40, 0x40);

			break;

		case 3:

			snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_CDC_TX_ANA_MODE_2_3, 0xF0,

				mode << 4);

			snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_CDC_DIG_CLK_CTL, 0x80, 0x80);

			break;

		default:

			break;

		}

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

		break;

	case SND_SOC_DAPM_POST_PMD:

		switch (w->shift) {

		case 0:

			snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_CDC_DIG_CLK_CTL, 0x10, 0x00);

			break;

		case 1:

			snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_CDC_ANA_CLK_CTL, 0x10, 0x00);

				WCD938X_DIGITAL_CDC_DIG_CLK_CTL, 0x20, 0x00);

			break;

		case 2:

			snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_CDC_DIG_CLK_CTL, 0x40, 0x00);

			break;

		case 3:

			snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_CDC_DIG_CLK_CTL, 0x80, 0x00);

			break;

		default:

			break;

		}

		snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_CDC_ANA_CLK_CTL, 0x10, 0x00);

		break;

	};

	return ret;

}