ASoC: codecs: ES8326: Solve headphone detection issue

[ Upstream commit b7c40988808f8d7426dee1e4d96a4e204de4a8bc ]

When switching between OMTP and CTIA headset, we can hear pop noise.
To solve this issue, We modified the configuration for headphone detection

Signed-off-by: Zhang Yi <zhangyi@everest-semi.com>
Link: https://msgid.link/r/20240604021946.2911-1-zhangyi@everest-semi.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/codecs/es8326.c b/sound/soc/codecs/es8326.c
index 17bd6b5160772e01d8597767868a9d2472cae276..8b2328d5d0c74eba6a0c94f526053b40e06075f9 100644 (file)
--- a/sound/soc/codecs/es8326.c
+++ b/sound/soc/codecs/es8326.c
@@ -865,12 +865,16 @@ static void es8326_jack_detect_handler(struct work_struct *work)
                         * set auto-check mode, then restart jack_detect_work after 400ms.
                         * Don't report jack status.
                         */
-                       regmap_write(es8326->regmap, ES8326_INT_SOURCE,
-                                       (ES8326_INT_SRC_PIN9 | ES8326_INT_SRC_BUTTON));
+                       regmap_write(es8326->regmap, ES8326_INT_SOURCE, 0x00);
                        regmap_update_bits(es8326->regmap, ES8326_HPDET_TYPE, 0x03, 0x01);
+                       regmap_update_bits(es8326->regmap, ES8326_HPDET_TYPE, 0x10, 0x00);
                        es8326_enable_micbias(es8326->component);
                        usleep_range(50000, 70000);
                        regmap_update_bits(es8326->regmap, ES8326_HPDET_TYPE, 0x03, 0x00);
+                       regmap_update_bits(es8326->regmap, ES8326_HPDET_TYPE, 0x10, 0x10);
+                       usleep_range(50000, 70000);
+                       regmap_write(es8326->regmap, ES8326_INT_SOURCE,
+                                       (ES8326_INT_SRC_PIN9 | ES8326_INT_SRC_BUTTON));
                        regmap_write(es8326->regmap, ES8326_SYS_BIAS, 0x1f);
                        regmap_update_bits(es8326->regmap, ES8326_HP_DRIVER_REF, 0x0f, 0x08);
                        queue_delayed_work(system_wq, &es8326->jack_detect_work,