Merge "ASoC: codecs: Fix pop noise in HPH plus LO4 concurrent usecase" (a6e313c1) · Commits · e / devices / android_kernel_sony_msm8998

sound/soc/codecs/wcd9335.c

+23 −6

Original line number	Diff line number	Diff line
		@@ -4073,6 +4073,8 @@ static int tasha_codec_enable_hphr_pa(struct snd_soc_dapm_widget *w,
		snd_soc_update_bits(codec, WCD9335_ANA_HPH, 0xC0, 0xC0);
		}
		set_bit(HPH_PA_DELAY, &tasha->status_mask);
		if (!(strcmp(w->name, "HPHR PA")))
		snd_soc_update_bits(codec, WCD9335_ANA_HPH, 0x40, 0x40);
		break;
		case SND_SOC_DAPM_POST_PMU:
		if (!(strcmp(w->name, "ANC HPHR PA"))) {
		@@ -4127,6 +4129,8 @@ static int tasha_codec_enable_hphr_pa(struct snd_soc_dapm_widget *w,
		tasha_codec_hph_post_pa_config(tasha, hph_mode, event);
		if (!(strcmp(w->name, "ANC HPHR PA")))
		snd_soc_update_bits(codec, WCD9335_ANA_HPH, 0x40, 0x00);
		if (!(strcmp(w->name, "HPHR PA")))
		snd_soc_update_bits(codec, WCD9335_ANA_HPH, 0x40, 0x00);
		break;
		case SND_SOC_DAPM_POST_PMD:
		/* 5ms sleep is required after PA is disabled as per
		@@ -4166,6 +4170,8 @@ static int tasha_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w,
		(test_bit(HPH_PA_DELAY, &tasha->status_mask))) {
		snd_soc_update_bits(codec, WCD9335_ANA_HPH, 0xC0, 0xC0);
		}
		if (!(strcmp(w->name, "HPHL PA")))
		snd_soc_update_bits(codec, WCD9335_ANA_HPH, 0x80, 0x80);
		set_bit(HPH_PA_DELAY, &tasha->status_mask);
		break;
		case SND_SOC_DAPM_POST_PMU:
		@@ -4222,6 +4228,8 @@ static int tasha_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w,
		tasha_codec_hph_post_pa_config(tasha, hph_mode, event);
		if (!(strcmp(w->name, "ANC HPHL PA")))
		snd_soc_update_bits(codec, WCD9335_ANA_HPH, 0x80, 0x00);
		if (!(strcmp(w->name, "HPHL PA")))
		snd_soc_update_bits(codec, WCD9335_ANA_HPH, 0x80, 0x00);
		break;
		case SND_SOC_DAPM_POST_PMD:
		/* 5ms sleep is required after PA is disabled as per
		@@ -4544,6 +4552,9 @@ static int tasha_codec_hphr_dac_event(struct snd_soc_dapm_widget *w,

		switch (event) {
		case SND_SOC_DAPM_PRE_PMU:
		if (!(strcmp(w->name, "RX INT2 DAC"))) {
		snd_soc_update_bits(codec, WCD9335_ANA_HPH, 0x10, 0x10);
		}
		if (tasha->anc_func) {
		ret = tasha_codec_enable_anc(w, kcontrol, event);
		/* 40 msec delay is needed to avoid click and pop */
		@@ -4582,6 +4593,8 @@ static int tasha_codec_hphr_dac_event(struct snd_soc_dapm_widget *w,
		}
		break;
		case SND_SOC_DAPM_PRE_PMD:
		if (!(strcmp(w->name, "RX INT2 DAC")))
		snd_soc_update_bits(codec, WCD9335_ANA_HPH, 0x10, 0x00);
		if ((hph_mode == CLS_H_LP) &&
		(TASHA_IS_1_1(wcd9xxx))) {
		snd_soc_update_bits(codec, WCD9335_HPH_L_DAC_CTL,
		@@ -4645,6 +4658,8 @@ static int tasha_codec_hphl_dac_event(struct snd_soc_dapm_widget *w,
		((hph_mode == CLS_H_LOHIFI) ?
		CLS_H_HIFI : hph_mode));

		if (!(strcmp(w->name, "RX INT1 DAC")))
		snd_soc_update_bits(codec, WCD9335_ANA_HPH, 0x20, 0x20);
		tasha_codec_hph_mode_config(codec, event, hph_mode);

		if (tasha->anc_func)
		@@ -4674,6 +4689,8 @@ static int tasha_codec_hphl_dac_event(struct snd_soc_dapm_widget *w,
		}
		break;
		case SND_SOC_DAPM_PRE_PMD:
		if (!(strcmp(w->name, "RX INT1 DAC")))
		snd_soc_update_bits(codec, WCD9335_ANA_HPH, 0x20, 0x00);
		if ((hph_mode == CLS_H_LP) &&
		(TASHA_IS_1_1(wcd9xxx))) {
		snd_soc_update_bits(codec, WCD9335_HPH_L_DAC_CTL,
		@@ -11094,12 +11111,12 @@ static const struct snd_soc_dapm_widget tasha_dapm_widgets[] = {
		0, 0, tasha_codec_ear_dac_event,
		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|
		SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),
		SND_SOC_DAPM_DAC_E("RX INT1 DAC", NULL, WCD9335_ANA_HPH,
		5, 0, tasha_codec_hphl_dac_event,
		SND_SOC_DAPM_DAC_E("RX INT1 DAC", NULL, SND_SOC_NOPM,
		0, 0, tasha_codec_hphl_dac_event,
		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|
		SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),
		SND_SOC_DAPM_DAC_E("RX INT2 DAC", NULL, WCD9335_ANA_HPH,
		4, 0, tasha_codec_hphr_dac_event,
		SND_SOC_DAPM_DAC_E("RX INT2 DAC", NULL, SND_SOC_NOPM,
		0, 0, tasha_codec_hphr_dac_event,
		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|
		SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),
		SND_SOC_DAPM_DAC_E("RX INT3 DAC", NULL, SND_SOC_NOPM,
		@@ -11114,11 +11131,11 @@ static const struct snd_soc_dapm_widget tasha_dapm_widgets[] = {
		SND_SOC_DAPM_DAC_E("RX INT6 DAC", NULL, SND_SOC_NOPM,
		0, 0, tasha_codec_lineout_dac_event,
		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMD),
		SND_SOC_DAPM_PGA_E("HPHL PA", WCD9335_ANA_HPH, 7, 0, NULL, 0,
		SND_SOC_DAPM_PGA_E("HPHL PA", SND_SOC_NOPM, 0, 0, NULL, 0,
		tasha_codec_enable_hphl_pa,
		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|
		SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),
		SND_SOC_DAPM_PGA_E("HPHR PA", WCD9335_ANA_HPH, 6, 0, NULL, 0,
		SND_SOC_DAPM_PGA_E("HPHR PA", SND_SOC_NOPM, 0, 0, NULL, 0,
		tasha_codec_enable_hphr_pa,
		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|
		SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),