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

Commit cf779bb1 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: config the TX1 ADC1 for 8916"

parents 50a2aa73 ababbfc2

sound/soc/codecs/msm8x16-wcd.c

+16 −6
Original line number Diff line number Diff line
@@ -1335,6 +1335,12 @@ static int msm8x16_wcd_codec_enable_adc(struct snd_soc_dapm_widget *w, 
		msm8x16_wcd_codec_enable_adc_block(codec, 1);

		snd_soc_update_bits(codec, adc_reg, 1 << init_bit_shift,

				1 << init_bit_shift);

		if (w->reg == MSM8X16_WCD_A_ANALOG_TX_1_EN)

			snd_soc_update_bits(codec,

				MSM8X16_WCD_A_DIGITAL_CDC_CONN_TX1_CTL,

				0x03, 0x00);

		else if ((w->reg == MSM8X16_WCD_A_ANALOG_TX_2_EN) ||

			(w->reg == MSM8X16_WCD_A_ANALOG_TX_3_EN))

			snd_soc_update_bits(codec,

				MSM8X16_WCD_A_DIGITAL_CDC_CONN_TX2_CTL,

				0x03, 0x00);
@@ -1343,15 +1349,19 @@ static int msm8x16_wcd_codec_enable_adc(struct snd_soc_dapm_widget *w, 
	case SND_SOC_DAPM_POST_PMU:

		snd_soc_update_bits(codec, adc_reg, 1 << init_bit_shift, 0x00);

		usleep_range(CODEC_DELAY_1_MS, CODEC_DELAY_1_1_MS);

		if (w->reg == MSM8X16_WCD_A_ANALOG_TX_2_EN)

		snd_soc_update_bits(codec, w->reg, 0x60, 0x60);

		break;

	case SND_SOC_DAPM_POST_PMD:

		msm8x16_wcd_codec_enable_adc_block(codec, 0);

		if (w->reg == MSM8X16_WCD_A_ANALOG_TX_1_EN)

			snd_soc_update_bits(codec,

				MSM8X16_WCD_A_DIGITAL_CDC_CONN_TX1_CTL,

				0x03, 0x02);

		else if ((w->reg == MSM8X16_WCD_A_ANALOG_TX_2_EN) ||

			(w->reg == MSM8X16_WCD_A_ANALOG_TX_3_EN))

			snd_soc_update_bits(codec,

				MSM8X16_WCD_A_DIGITAL_CDC_CONN_TX2_CTL,

				0x03, 0x02);

		if (w->reg == MSM8X16_WCD_A_ANALOG_TX_2_EN)

		snd_soc_update_bits(codec, w->reg, 0x60, 0x00);



		break;