Merge "ASoC: msm8x16-wcd: Fix lineout pop issue" (4d30736f) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/codecs/msm8x16-wcd.c

+4 −8

Original line number	Diff line number	Diff line
		@@ -4242,8 +4242,6 @@ static int msm8x16_wcd_lo_dac_event(struct snd_soc_dapm_widget *w,
		MSM8X16_WCD_A_ANALOG_RX_LO_DAC_CTL, 0x80, 0x80);
		snd_soc_update_bits(codec,
		MSM8X16_WCD_A_ANALOG_RX_LO_DAC_CTL, 0x08, 0x00);
		snd_soc_update_bits(codec,
		MSM8X16_WCD_A_ANALOG_RX_LO_EN_CTL, 0x40, 0x40);
		break;
		case SND_SOC_DAPM_POST_PMD:
		usleep_range(20000, 20100);
		@@ -4255,8 +4253,6 @@ static int msm8x16_wcd_lo_dac_event(struct snd_soc_dapm_widget *w,
		MSM8X16_WCD_A_ANALOG_RX_LO_DAC_CTL, 0x08, 0x00);
		snd_soc_update_bits(codec,
		MSM8X16_WCD_A_ANALOG_RX_LO_EN_CTL, 0x80, 0x00);
		snd_soc_update_bits(codec,
		MSM8X16_WCD_A_ANALOG_RX_LO_EN_CTL, 0x40, 0x00);
		snd_soc_update_bits(codec,
		MSM8X16_WCD_A_ANALOG_RX_LO_EN_CTL, 0x20, 0x00);
		snd_soc_update_bits(codec,
		@@ -4913,9 +4909,9 @@ static int msm8x16_wcd_codec_enable_lo_pa(struct snd_soc_dapm_widget *w,
		snd_soc_update_bits(codec,
		MSM8X16_WCD_A_CDC_RX3_B6_CTL, 0x01, 0x00);
		break;
		case SND_SOC_DAPM_POST_PMD:
		case SND_SOC_DAPM_PRE_PMD:
		snd_soc_update_bits(codec,
		MSM8X16_WCD_A_CDC_RX3_B6_CTL, 0x01, 0x00);
		MSM8X16_WCD_A_CDC_RX3_B6_CTL, 0x01, 0x01);
		break;
		}

		@@ -5099,8 +5095,8 @@ static const struct snd_soc_dapm_widget msm8x16_wcd_dapm_widgets[] = {
		SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),

		SND_SOC_DAPM_PGA_E("LINEOUT PA", MSM8X16_WCD_A_ANALOG_RX_LO_EN_CTL,
		5, 0 , NULL, 0, msm8x16_wcd_codec_enable_lo_pa,
		SND_SOC_DAPM_POST_PMU \| SND_SOC_DAPM_POST_PMD),
		6, 0 , NULL, 0, msm8x16_wcd_codec_enable_lo_pa,
		SND_SOC_DAPM_POST_PMU \| SND_SOC_DAPM_PRE_PMD),

		SND_SOC_DAPM_SUPPLY("VDD_SPKDRV", SND_SOC_NOPM, 0, 0,
		msm89xx_wcd_codec_enable_vdd_spkr,