Merge "ASoC: Change Ear PA disable sequence" (77c53c24) · Commits · e / devices / android_kernel_sony_msm8994

sound/soc/codecs/msm8x10-wcd.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -2373,6 +2373,10 @@ static int msm8x10_wcd_codec_enable_ear_pa(struct snd_soc_dapm_widget *w,
		struct snd_kcontrol *kcontrol, int event)
		{
		switch (event) {
		case SND_SOC_DAPM_PRE_PMU:
		snd_soc_update_bits(w->codec, MSM8X10_WCD_A_CDC_ANA_CLK_CTL,
		0x4, 0x4);
		break;
		case SND_SOC_DAPM_POST_PMU:
		dev_dbg(w->codec->dev,
		"%s: Sleeping 20ms after enabling EAR PA\n",
		@@ -2383,6 +2387,8 @@ static int msm8x10_wcd_codec_enable_ear_pa(struct snd_soc_dapm_widget *w,
		dev_dbg(w->codec->dev,
		"%s: Sleeping 20ms after disabling EAR PA\n",
		__func__);
		snd_soc_update_bits(w->codec, MSM8X10_WCD_A_CDC_ANA_CLK_CTL,
		0x4, 0x0);
		msleep(20);
		break;
		}
		@@ -2394,7 +2400,7 @@ static const struct snd_soc_dapm_widget msm8x10_wcd_dapm_widgets[] = {
		SND_SOC_DAPM_OUTPUT("EAR"),

		SND_SOC_DAPM_PGA_E("EAR PA", MSM8X10_WCD_A_RX_EAR_EN, 4, 0, NULL, 0,
		msm8x10_wcd_codec_enable_ear_pa,
		msm8x10_wcd_codec_enable_ear_pa, SND_SOC_DAPM_PRE_PMU \|
		SND_SOC_DAPM_POST_PMU \| SND_SOC_DAPM_POST_PMD),

		SND_SOC_DAPM_MIXER("DAC1", MSM8X10_WCD_A_RX_EAR_EN, 6, 0, dac1_switch,
		@@ -2483,7 +2489,7 @@ static const struct snd_soc_dapm_widget msm8x10_wcd_dapm_widgets[] = {
		SND_SOC_DAPM_SUPPLY("HPHL CLK", MSM8X10_WCD_A_CDC_ANA_CLK_CTL,
		1, 0, NULL, 0),
		SND_SOC_DAPM_SUPPLY("EAR CLK", MSM8X10_WCD_A_CDC_ANA_CLK_CTL,
		2, 0, NULL, 0),
		6, 0, NULL, 0),
		SND_SOC_DAPM_SUPPLY("LINEOUT CLK", MSM8X10_WCD_A_CDC_ANA_CLK_CTL,
		3, 0, NULL, 0),
		SND_SOC_DAPM_SUPPLY("SPK CLK", MSM8X10_WCD_A_CDC_ANA_CLK_CTL,