Merge "ASoC: msm8x16-wcd: reset pa select after ear pa disable" (fb2f3c1f) · Commits · e / devices / android_kernel_sony_msm8994

sound/soc/codecs/msm8x16-wcd.c

+10 −4

Original line number	Diff line number	Diff line
		@@ -2598,11 +2598,17 @@ static int msm8x16_wcd_codec_enable_ear_pa(struct snd_soc_dapm_widget *w,
		break;
		case SND_SOC_DAPM_POST_PMD:
		dev_dbg(w->codec->dev,
		"%s: Sleeping 20ms after disabling EAR PA\n",
		"%s: Sleeping 7ms after disabling EAR PA\n",
		__func__);
		snd_soc_update_bits(codec, MSM8X16_WCD_A_ANALOG_RX_EAR_CTL,
		0xC0, 0x00);
		0x40, 0x00);
		usleep_range(7000, 7100);
		/*
		* Reset pa select bit from ear to hph after ear pa
		* is disabled to reduce ear turn off pop
		*/
		snd_soc_update_bits(codec, MSM8X16_WCD_A_ANALOG_RX_EAR_CTL,
		0x80, 0x00);
		break;
		}
		return 0;
		@@ -2612,8 +2618,8 @@ static const struct snd_soc_dapm_widget msm8x16_wcd_dapm_widgets[] = {
		/RX stuff /
		SND_SOC_DAPM_OUTPUT("EAR"),

		SND_SOC_DAPM_PGA_E("EAR PA", MSM8X16_WCD_A_ANALOG_RX_EAR_CTL,
		7, 0, NULL, 0, msm8x16_wcd_codec_enable_ear_pa,
		SND_SOC_DAPM_PGA_E("EAR PA", SND_SOC_NOPM,
		0, 0, NULL, 0, msm8x16_wcd_codec_enable_ear_pa,
		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|
		SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),
		SND_SOC_DAPM_MIXER("EAR_S", SND_SOC_NOPM, 0, 0,