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

sound/soc/codecs/wcd9335.c

+20 −6

Original line number	Original line	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);		snd_soc_update_bits(codec, WCD9335_ANA_HPH, 0xC0, 0xC0);
	}		}
	set_bit(HPH_PA_DELAY, &tasha->status_mask);		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;		break;
	case SND_SOC_DAPM_POST_PMU:		case SND_SOC_DAPM_POST_PMU:
	if (!(strcmp(w->name, "ANC HPHR PA"))) {		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);		tasha_codec_hph_post_pa_config(tasha, hph_mode, event);
	if (!(strcmp(w->name, "ANC HPHR PA")))		if (!(strcmp(w->name, "ANC HPHR PA")))
	snd_soc_update_bits(codec, WCD9335_ANA_HPH, 0x40, 0x00);		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;		break;
	case SND_SOC_DAPM_POST_PMD:		case SND_SOC_DAPM_POST_PMD:
	/* 5ms sleep is required after PA is disabled as per		/* 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))) {		(test_bit(HPH_PA_DELAY, &tasha->status_mask))) {
	snd_soc_update_bits(codec, WCD9335_ANA_HPH, 0xC0, 0xC0);		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);		set_bit(HPH_PA_DELAY, &tasha->status_mask);
	break;		break;
	case SND_SOC_DAPM_POST_PMU:		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);		tasha_codec_hph_post_pa_config(tasha, hph_mode, event);
	if (!(strcmp(w->name, "ANC HPHL PA")))		if (!(strcmp(w->name, "ANC HPHL PA")))
	snd_soc_update_bits(codec, WCD9335_ANA_HPH, 0x80, 0x00);		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;		break;
	case SND_SOC_DAPM_POST_PMD:		case SND_SOC_DAPM_POST_PMD:
	/* 5ms sleep is required after PA is disabled as per		/* 5ms sleep is required after PA is disabled as per
	@@ -4544,6 +4552,10 @@ static int tasha_codec_hphr_dac_event(struct snd_soc_dapm_widget *w,

	switch (event) {		switch (event) {
	case SND_SOC_DAPM_PRE_PMU:		case SND_SOC_DAPM_PRE_PMU:
			if (!(strcmp(w->name, "RX INT2 DAC"))) {
			snd_soc_update_bits(codec, WCD9335_ANA_HPH, 0x20, 0x20);
			snd_soc_update_bits(codec, WCD9335_ANA_HPH, 0x10, 0x10);
			}
	if (tasha->anc_func) {		if (tasha->anc_func) {
	ret = tasha_codec_enable_anc(w, kcontrol, event);		ret = tasha_codec_enable_anc(w, kcontrol, event);
	/* 40 msec delay is needed to avoid click and pop */		/* 40 msec delay is needed to avoid click and pop */
	@@ -4582,6 +4594,8 @@ static int tasha_codec_hphr_dac_event(struct snd_soc_dapm_widget *w,
	}		}
	break;		break;
	case SND_SOC_DAPM_PRE_PMD:		case SND_SOC_DAPM_PRE_PMD:
			if (!(strcmp(w->name, "RX INT2 DAC")))
			snd_soc_update_bits(codec, WCD9335_ANA_HPH, 0x30, 0x00);
	if ((hph_mode == CLS_H_LP) &&		if ((hph_mode == CLS_H_LP) &&
	(TASHA_IS_1_1(wcd9xxx))) {		(TASHA_IS_1_1(wcd9xxx))) {
	snd_soc_update_bits(codec, WCD9335_HPH_L_DAC_CTL,		snd_soc_update_bits(codec, WCD9335_HPH_L_DAC_CTL,
	@@ -11094,12 +11108,12 @@ static const struct snd_soc_dapm_widget tasha_dapm_widgets[] = {
	0, 0, tasha_codec_ear_dac_event,		0, 0, tasha_codec_ear_dac_event,
	SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|
	SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),		SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),
	SND_SOC_DAPM_DAC_E("RX INT1 DAC", NULL, WCD9335_ANA_HPH,		SND_SOC_DAPM_DAC_E("RX INT1 DAC", NULL, SND_SOC_NOPM,
	5, 0, tasha_codec_hphl_dac_event,		0, 0, tasha_codec_hphl_dac_event,
	SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|
	SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),		SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),
	SND_SOC_DAPM_DAC_E("RX INT2 DAC", NULL, WCD9335_ANA_HPH,		SND_SOC_DAPM_DAC_E("RX INT2 DAC", NULL, SND_SOC_NOPM,
	4, 0, tasha_codec_hphr_dac_event,		0, 0, tasha_codec_hphr_dac_event,
	SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|
	SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),		SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),
	SND_SOC_DAPM_DAC_E("RX INT3 DAC", NULL, SND_SOC_NOPM,		SND_SOC_DAPM_DAC_E("RX INT3 DAC", NULL, SND_SOC_NOPM,
	@@ -11114,11 +11128,11 @@ static const struct snd_soc_dapm_widget tasha_dapm_widgets[] = {
	SND_SOC_DAPM_DAC_E("RX INT6 DAC", NULL, SND_SOC_NOPM,		SND_SOC_DAPM_DAC_E("RX INT6 DAC", NULL, SND_SOC_NOPM,
	0, 0, tasha_codec_lineout_dac_event,		0, 0, tasha_codec_lineout_dac_event,
	SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMD),		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,		tasha_codec_enable_hphl_pa,
	SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|
	SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),		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,		tasha_codec_enable_hphr_pa,
	SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|
	SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),		SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),

sound/soc/codecs/wcd934x/wcd934x.c

+22 −6

Original line number	Original line	Diff line number	Diff line
	@@ -2014,6 +2014,8 @@ static int tavil_codec_enable_hphr_pa(struct snd_soc_dapm_widget *w,
	snd_soc_update_bits(codec, WCD934X_ANA_RX_SUPPLIES,		snd_soc_update_bits(codec, WCD934X_ANA_RX_SUPPLIES,
	0x02, 0x02);		0x02, 0x02);
	}		}
			if (!(strcmp(w->name, "HPHR PA")))
			snd_soc_update_bits(codec, WCD934X_ANA_HPH, 0x40, 0x40);
	break;		break;
	case SND_SOC_DAPM_POST_PMU:		case SND_SOC_DAPM_POST_PMU:
	if ((!(strcmp(w->name, "ANC HPHR PA")))) {		if ((!(strcmp(w->name, "ANC HPHR PA")))) {
	@@ -2112,6 +2114,8 @@ static int tavil_codec_enable_hphr_pa(struct snd_soc_dapm_widget *w,
	0x10, 0x10);		0x10, 0x10);
	if (!(strcmp(w->name, "ANC HPHR PA")))		if (!(strcmp(w->name, "ANC HPHR PA")))
	snd_soc_update_bits(codec, WCD934X_ANA_HPH, 0x40, 0x00);		snd_soc_update_bits(codec, WCD934X_ANA_HPH, 0x40, 0x00);
			if (!(strcmp(w->name, "HPHR PA")))
			snd_soc_update_bits(codec, WCD934X_ANA_HPH, 0x40, 0x00);
	break;		break;
	case SND_SOC_DAPM_POST_PMD:		case SND_SOC_DAPM_POST_PMD:
	/*		/*
	@@ -2161,6 +2165,8 @@ static int tavil_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w,
	(test_bit(HPH_PA_DELAY, &tavil->status_mask)))		(test_bit(HPH_PA_DELAY, &tavil->status_mask)))
	snd_soc_update_bits(codec, WCD934X_ANA_HPH,		snd_soc_update_bits(codec, WCD934X_ANA_HPH,
	0xC0, 0xC0);		0xC0, 0xC0);
			if (!(strcmp(w->name, "HPHL PA")))
			snd_soc_update_bits(codec, WCD934X_ANA_HPH, 0x80, 0x80);
	set_bit(HPH_PA_DELAY, &tavil->status_mask);		set_bit(HPH_PA_DELAY, &tavil->status_mask);
	if (dsd_conf &&		if (dsd_conf &&
	(snd_soc_read(codec, WCD934X_CDC_DSD0_PATH_CTL) & 0x01)) {		(snd_soc_read(codec, WCD934X_CDC_DSD0_PATH_CTL) & 0x01)) {
	@@ -2266,6 +2272,8 @@ static int tavil_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w,
	if (!(strcmp(w->name, "ANC HPHL PA")))		if (!(strcmp(w->name, "ANC HPHL PA")))
	snd_soc_update_bits(codec, WCD934X_ANA_HPH,		snd_soc_update_bits(codec, WCD934X_ANA_HPH,
	0x80, 0x00);		0x80, 0x00);
			if (!(strcmp(w->name, "HPHL PA")))
			snd_soc_update_bits(codec, WCD934X_ANA_HPH, 0x80, 0x00);
	break;		break;
	case SND_SOC_DAPM_POST_PMD:		case SND_SOC_DAPM_POST_PMD:
	/*		/*
	@@ -2418,6 +2426,10 @@ static int tavil_codec_hphr_dac_event(struct snd_soc_dapm_widget *w,

	switch (event) {		switch (event) {
	case SND_SOC_DAPM_PRE_PMU:		case SND_SOC_DAPM_PRE_PMU:
			if (!(strcmp(w->name, "RX INT2 DAC"))) {
			snd_soc_update_bits(codec, WCD934X_ANA_HPH, 0x20, 0x20);
			snd_soc_update_bits(codec, WCD934X_ANA_HPH, 0x10, 0x10);
			}
	if (tavil->anc_func) {		if (tavil->anc_func) {
	ret = tavil_codec_enable_anc(w, kcontrol, event);		ret = tavil_codec_enable_anc(w, kcontrol, event);
	/* 40 msec delay is needed to avoid click and pop */		/* 40 msec delay is needed to avoid click and pop */
	@@ -2458,6 +2470,10 @@ static int tavil_codec_hphr_dac_event(struct snd_soc_dapm_widget *w,
	WCD934X_CDC_RX2_RX_PATH_CFG0,		WCD934X_CDC_RX2_RX_PATH_CFG0,
	0x10, 0x10);		0x10, 0x10);
	break;		break;
			case SND_SOC_DAPM_PRE_PMD:
			if (!(strcmp(w->name, "RX INT2 DAC")))
			snd_soc_update_bits(codec, WCD934X_ANA_HPH, 0x30, 0x00);
			break;
	case SND_SOC_DAPM_POST_PMD:		case SND_SOC_DAPM_POST_PMD:
	/* 1000us required as per HW requirement */		/* 1000us required as per HW requirement */
	usleep_range(1000, 1100);		usleep_range(1000, 1100);
	@@ -7365,12 +7381,12 @@ static const struct snd_soc_dapm_widget tavil_dapm_widgets[] = {
	0, 0, tavil_codec_ear_dac_event,		0, 0, tavil_codec_ear_dac_event,
	SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|
	SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),		SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),
	SND_SOC_DAPM_DAC_E("RX INT1 DAC", NULL, WCD934X_ANA_HPH,		SND_SOC_DAPM_DAC_E("RX INT1 DAC", NULL, SND_SOC_NOPM,
	5, 0, tavil_codec_hphl_dac_event,		0, 0, tavil_codec_hphl_dac_event,
	SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|
	SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),		SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),
	SND_SOC_DAPM_DAC_E("RX INT2 DAC", NULL, WCD934X_ANA_HPH,		SND_SOC_DAPM_DAC_E("RX INT2 DAC", NULL, SND_SOC_NOPM,
	4, 0, tavil_codec_hphr_dac_event,		0, 0, tavil_codec_hphr_dac_event,
	SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|
	SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),		SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),
	SND_SOC_DAPM_DAC_E("RX INT3 DAC", NULL, SND_SOC_NOPM,		SND_SOC_DAPM_DAC_E("RX INT3 DAC", NULL, SND_SOC_NOPM,
	@@ -7383,11 +7399,11 @@ static const struct snd_soc_dapm_widget tavil_dapm_widgets[] = {
	SND_SOC_DAPM_PGA_E("EAR PA", WCD934X_ANA_EAR, 7, 0, NULL, 0,		SND_SOC_DAPM_PGA_E("EAR PA", WCD934X_ANA_EAR, 7, 0, NULL, 0,
	tavil_codec_enable_ear_pa,		tavil_codec_enable_ear_pa,
	SND_SOC_DAPM_POST_PMU \| SND_SOC_DAPM_POST_PMD),		SND_SOC_DAPM_POST_PMU \| SND_SOC_DAPM_POST_PMD),
	SND_SOC_DAPM_PGA_E("HPHL PA", WCD934X_ANA_HPH, 7, 0, NULL, 0,		SND_SOC_DAPM_PGA_E("HPHL PA", SND_SOC_NOPM, 0, 0, NULL, 0,
	tavil_codec_enable_hphl_pa,		tavil_codec_enable_hphl_pa,
	SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|
	SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),		SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),
	SND_SOC_DAPM_PGA_E("HPHR PA", WCD934X_ANA_HPH, 6, 0, NULL, 0,		SND_SOC_DAPM_PGA_E("HPHR PA", SND_SOC_NOPM, 0, 0, NULL, 0,
	tavil_codec_enable_hphr_pa,		tavil_codec_enable_hphr_pa,
	SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|
	SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),		SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),