Unverified Commit a3aa9255 authored by Zhu Ning's avatar Zhu Ning Committed by Mark Brown
Browse files

ASoC: codecs: ES8326: Minimize the pop noise on headphone 



We modify the register settings to minimize headphone pop noise
during ES8326 power-up and music start/stop.

Signed-off-by: default avatarZhu Ning <zhuning0077@gmail.com>
Link: https://msgid.link/r/20240120101240.12496-5-zhuning0077@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 14a0a1ec

sound/soc/codecs/es8326.c

+20 −16
Original line number Diff line number Diff line
@@ -523,7 +523,8 @@ static int es8326_mute(struct snd_soc_dai *dai, int mute, int direction) 
		regmap_write(es8326->regmap, ES8326_HP_CAL, ES8326_HP_OFF);

		regmap_update_bits(es8326->regmap, ES8326_DAC_MUTE,

				ES8326_MUTE_MASK, ES8326_MUTE);

		regmap_write(es8326->regmap, ES8326_HP_DRIVER, 0xf0);

		regmap_update_bits(es8326->regmap, ES8326_HP_DRIVER_REF,

				0x30, 0x00);

	} else {

		if (!es8326->calibrated) {

			regmap_write(es8326->regmap, ES8326_HP_CAL, ES8326_HP_FORCE_CAL);
@@ -536,8 +537,13 @@ static int es8326_mute(struct snd_soc_dai *dai, int mute, int direction) 
			regmap_write(es8326->regmap, ES8326_HPR_OFFSET_INI, offset_r);

			es8326->calibrated = true;

		}

		regmap_update_bits(es8326->regmap, ES8326_DAC_DSM, 0x01, 0x01);

		usleep_range(1000, 5000);

		regmap_update_bits(es8326->regmap, ES8326_DAC_DSM, 0x01, 0x00);

		usleep_range(1000, 5000);

		regmap_update_bits(es8326->regmap, ES8326_HP_DRIVER_REF, 0x30, 0x20);

		regmap_update_bits(es8326->regmap, ES8326_HP_DRIVER_REF, 0x30, 0x30);

		regmap_write(es8326->regmap, ES8326_HP_DRIVER, 0xa1);

		regmap_write(es8326->regmap, ES8326_HP_VOL, 0x91);

		regmap_write(es8326->regmap, ES8326_HP_CAL, ES8326_HP_ON);

		regmap_update_bits(es8326->regmap, ES8326_DAC_MUTE,

				ES8326_MUTE_MASK, ~(ES8326_MUTE));
@@ -557,23 +563,20 @@ static int es8326_set_bias_level(struct snd_soc_component *codec, 
		if (ret)

			return ret;



		regmap_update_bits(es8326->regmap, ES8326_DAC_DSM, 0x01, 0x00);

		regmap_update_bits(es8326->regmap, ES8326_RESET, 0x02, 0x02);

		usleep_range(5000, 10000);

		regmap_write(es8326->regmap, ES8326_INTOUT_IO, es8326->interrupt_clk);

		regmap_write(es8326->regmap, ES8326_SDINOUT1_IO,

			    (ES8326_IO_DMIC_CLK << ES8326_SDINOUT1_SHIFT));

		regmap_write(es8326->regmap, ES8326_VMIDSEL, 0x0E);

		regmap_write(es8326->regmap, ES8326_PGA_PDN, 0x40);

		regmap_write(es8326->regmap, ES8326_ANA_PDN, 0x00);

		regmap_update_bits(es8326->regmap,  ES8326_CLK_CTL, 0x20, 0x20);



		regmap_update_bits(es8326->regmap, ES8326_RESET,

				ES8326_CSM_ON, ES8326_CSM_ON);

		regmap_update_bits(es8326->regmap, ES8326_RESET, 0x02, 0x00);

		break;

	case SND_SOC_BIAS_PREPARE:

		break;

	case SND_SOC_BIAS_STANDBY:

		regmap_write(es8326->regmap, ES8326_ANA_PDN, 0x3b);

		regmap_write(es8326->regmap, ES8326_VMIDSEL, 0x00);

		regmap_update_bits(es8326->regmap, ES8326_CLK_CTL, 0x20, 0x00);

		regmap_write(es8326->regmap, ES8326_SDINOUT1_IO, ES8326_IO_INPUT);

		break;
@@ -777,6 +780,7 @@ static void es8326_jack_detect_handler(struct work_struct *work) 
			 * Don't report jack status.

			 */

			regmap_update_bits(es8326->regmap, ES8326_HPDET_TYPE, 0x03, 0x01);

			es8326_enable_micbias(es8326->component);

			usleep_range(50000, 70000);

			regmap_update_bits(es8326->regmap, ES8326_HPDET_TYPE, 0x03, 0x00);

			regmap_write(es8326->regmap, ES8326_SYS_BIAS, 0x1f);
@@ -820,13 +824,10 @@ static void es8326_jack_detect_handler(struct work_struct *work) 
static irqreturn_t es8326_irq(int irq, void *dev_id)

{

	struct es8326_priv *es8326 = dev_id;

	struct snd_soc_component *comp = es8326->component;



	if (!es8326->jack)

		goto out;



	es8326_enable_micbias(comp);



	if (es8326->jack->status & SND_JACK_HEADSET)

		queue_delayed_work(system_wq, &es8326->jack_detect_work,

				   msecs_to_jiffies(10));
@@ -943,6 +944,14 @@ static int es8326_resume(struct snd_soc_component *component) 
	regmap_write(es8326->regmap, ES8326_DAC_DSM, 0x08);

	regmap_write(es8326->regmap, ES8326_DAC_VPPSCALE, 0x15);



	regmap_write(es8326->regmap, ES8326_HPDET_TYPE, 0x80 |

			((es8326->version == ES8326_VERSION_B) ?

			(ES8326_HP_DET_SRC_PIN9 | es8326->jack_pol) :

			(ES8326_HP_DET_SRC_PIN9 | es8326->jack_pol | 0x04)));

	usleep_range(5000, 10000);

	es8326_enable_micbias(es8326->component);

	usleep_range(50000, 70000);

	regmap_update_bits(es8326->regmap, ES8326_HPDET_TYPE, 0x03, 0x00);

	regmap_write(es8326->regmap, ES8326_INT_SOURCE,

		    (ES8326_INT_SRC_PIN9 | ES8326_INT_SRC_BUTTON));

	regmap_write(es8326->regmap, ES8326_INTOUT_IO,
@@ -959,11 +968,6 @@ static int es8326_resume(struct snd_soc_component *component) 
	regmap_update_bits(es8326->regmap, ES8326_DAC_MUTE, ES8326_MUTE_MASK,

			   ES8326_MUTE);



	regmap_write(es8326->regmap, ES8326_HPDET_TYPE, 0x80 |

			((es8326->version == ES8326_VERSION_B) ?

			(ES8326_HP_DET_SRC_PIN9 | es8326->jack_pol) :

			(ES8326_HP_DET_SRC_PIN9 | es8326->jack_pol | 0x04)));

	regmap_write(es8326->regmap, ES8326_HP_VOL, 0x11);



	es8326->jack_remove_retry = 0;

	es8326->hp = 0;