Merge "ASoC: msm8x16: fix the silence playback on enabling the sidetone path" (0e828a51) · Commits · e / devices / android_kernel_sony_msm8994

sound/soc/codecs/msm8x16-wcd.c

+5 −10

Original line number	Diff line number	Diff line
		@@ -1958,11 +1958,6 @@ static int msm8x16_wcd_codec_enable_interpolator(struct snd_soc_dapm_widget *w,
		dev_dbg(codec->dev, "%s %d %s\n", __func__, event, w->name);

		switch (event) {
		case SND_SOC_DAPM_PRE_PMU:
		snd_soc_update_bits(codec,
		MSM8X16_WCD_A_CDC_RX1_B6_CTL + (w->shift*0x20),
		0x01, 0x01);
		break;
		case SND_SOC_DAPM_POST_PMU:
		/* apply the digital gain after the interpolator is enabled*/
		if ((w->shift) < ARRAY_SIZE(rx_digital_gain_reg))
		@@ -2651,25 +2646,25 @@ static const struct snd_soc_dapm_widget msm8x16_wcd_dapm_widgets[] = {
		SND_SOC_DAPM_MIXER_E("RX1 MIX1",
		MSM8X16_WCD_A_CDC_CLK_RX_B1_CTL, 0, 0, NULL, 0,
		msm8x16_wcd_codec_enable_interpolator,
		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|
		SND_SOC_DAPM_POST_PMU \|
		SND_SOC_DAPM_POST_PMD),
		SND_SOC_DAPM_MIXER_E("RX2 MIX1",
		MSM8X16_WCD_A_CDC_CLK_RX_B1_CTL, 1, 0, NULL, 0,
		msm8x16_wcd_codec_enable_interpolator,
		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|
		SND_SOC_DAPM_POST_PMU \|
		SND_SOC_DAPM_POST_PMD),

		SND_SOC_DAPM_MIXER_E("RX1 MIX2",
		MSM8X16_WCD_A_CDC_CLK_RX_B1_CTL, 0, 0, NULL,
		0, msm8x16_wcd_codec_enable_interpolator, SND_SOC_DAPM_PRE_PMU \|
		0, msm8x16_wcd_codec_enable_interpolator,
		SND_SOC_DAPM_POST_PMU \| SND_SOC_DAPM_POST_PMD),
		SND_SOC_DAPM_MIXER_E("RX2 MIX2",
		MSM8X16_WCD_A_CDC_CLK_RX_B1_CTL, 1, 0, NULL,
		0, msm8x16_wcd_codec_enable_interpolator, SND_SOC_DAPM_PRE_PMU \|
		0, msm8x16_wcd_codec_enable_interpolator,
		SND_SOC_DAPM_POST_PMU \| SND_SOC_DAPM_POST_PMD),
		SND_SOC_DAPM_MIXER_E("RX3 MIX1",
		MSM8X16_WCD_A_CDC_CLK_RX_B1_CTL, 2, 0, NULL,
		0, msm8x16_wcd_codec_enable_interpolator, SND_SOC_DAPM_PRE_PMU \|
		0, msm8x16_wcd_codec_enable_interpolator,
		SND_SOC_DAPM_POST_PMU \| SND_SOC_DAPM_POST_PMD),

		SND_SOC_DAPM_SUPPLY("RX1 CLK", MSM8X16_WCD_A_DIGITAL_CDC_DIG_CLK_CTL,