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

Commit f6d162a8 authored by Aravind Kumar's avatar Aravind Kumar Committed by Gerrit - the friendly Code Review server
Browse files

ASoC: msm8x16-wcd: fix the pop during voice call disconnect 



Powering down the sidetones path tears down the
interpolator clock along with it before the rx path is
teared down.
The change ensures that the interpolator clock will
tear down only when rx path is teared down.

Change-Id: I1144585bda1a489664ba08bed5478a5a332b9628
Signed-off-by: default avatarAravind Kumar <akumark@codeaurora.org>
parent 191ce512

sound/soc/codecs/msm8x16-wcd.c

+4 −12
Original line number Diff line number Diff line
@@ -2407,8 +2407,6 @@ static const struct snd_soc_dapm_route audio_map[] = { 
	{"RX3 CHAIN", NULL, "RX3 CLK"},

	{"RX1 CHAIN", NULL, "RX1 MIX2"},

	{"RX2 CHAIN", NULL, "RX2 MIX2"},

	{"RX1 CHAIN", NULL, "RX1 MIX1"},

	{"RX2 CHAIN", NULL, "RX2 MIX1"},

	{"RX3 CHAIN", NULL, "RX3 MIX1"},



	{"RX1 MIX1", NULL, "RX1 MIX1 INP1"},
@@ -2418,7 +2416,9 @@ static const struct snd_soc_dapm_route audio_map[] = { 
	{"RX2 MIX1", NULL, "RX2 MIX1 INP2"},

	{"RX3 MIX1", NULL, "RX3 MIX1 INP1"},

	{"RX3 MIX1", NULL, "RX3 MIX1 INP2"},

	{"RX1 MIX2", NULL, "RX1 MIX1"},

	{"RX1 MIX2", NULL, "RX1 MIX2 INP1"},

	{"RX2 MIX2", NULL, "RX2 MIX1"},

	{"RX2 MIX2", NULL, "RX2 MIX2 INP1"},



	{"RX1 MIX1 INP1", "RX1", "I2S RX1"},
@@ -2917,16 +2917,8 @@ static const struct snd_soc_dapm_widget msm8x16_wcd_dapm_widgets[] = { 
			SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |

			SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD),



	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_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_POST_PMU |

			SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_MIXER("RX1 MIX1", SND_SOC_NOPM, 0, 0, NULL, 0),

	SND_SOC_DAPM_MIXER("RX2 MIX1", SND_SOC_NOPM, 0, 0, NULL, 0),



	SND_SOC_DAPM_MIXER_E("RX1 MIX2",

		MSM8X16_WCD_A_CDC_CLK_RX_B1_CTL, 0, 0, NULL,