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

Commit dbec603a 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: fix the pop during voice call disconnect"

parents 6014bb19 f6d162a8

sound/soc/codecs/msm8x16-wcd.c

+4 −12
Original line number Diff line number Diff line
@@ -2493,8 +2493,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"},
@@ -2504,7 +2502,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"},
@@ -3012,16 +3012,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,