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

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

Merge "ASoC: msm8x16-wcd: Avoid cross talk during IN2 record"

parents 190cb00d 32bf7ea9

sound/soc/codecs/msm8x16-wcd.c

+6 −0
Original line number Diff line number Diff line
@@ -1495,6 +1495,9 @@ static int msm8x16_wcd_codec_enable_adc(struct snd_soc_dapm_widget *w, 
	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		msm8x16_wcd_codec_enable_adc_block(codec, 1);

		if (w->reg == MSM8X16_WCD_A_ANALOG_TX_2_EN)

			snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_MICB_1_CTL, 0x02, 0x02);

		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)
@@ -1514,6 +1517,9 @@ static int msm8x16_wcd_codec_enable_adc(struct snd_soc_dapm_widget *w, 
		break;

	case SND_SOC_DAPM_POST_PMD:

		msm8x16_wcd_codec_enable_adc_block(codec, 0);

		if (w->reg == MSM8X16_WCD_A_ANALOG_TX_2_EN)

			snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_MICB_1_CTL, 0x02, 0x00);

		if (w->reg == MSM8X16_WCD_A_ANALOG_TX_1_EN)

			snd_soc_update_bits(codec,

				MSM8X16_WCD_A_DIGITAL_CDC_CONN_TX1_CTL,