[1/2] ALSA: hda/cs8409: Prevent pops and clicks during suspend

Commit Message

Vitaly Rodionov Aug. 12, 2021, 6:34 p.m. UTC

From: Stefan Binding <[e-mail]>

Some of the register values set for type detection cause pops during suspend,
ensure these are cleaned up after type detection completes, as well
ensuring that these are cleared when we suspend.

Signed-off-by: Stefan Binding <[e-mail]>
Signed-off-by: Vitaly Rodionov <[e-mail]>
---
 sound/pci/hda/patch_cs8409.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Takashi Iwai Aug. 13, 2021, 6:08 a.m. UTC | #1

On Thu, 12 Aug 2021 20:34:32 +0200,
Vitaly Rodionov wrote:
> 
> From: Stefan Binding <[e-mail]>
> 
> Some of the register values set for type detection cause pops during suspend,
> ensure these are cleaned up after type detection completes, as well
> ensuring that these are cleared when we suspend.
> 
> Signed-off-by: Stefan Binding <[e-mail]>
> Signed-off-by: Vitaly Rodionov <[e-mail]>

Thanks, this one is applied now.


Takashi

Patch

diff --git a/sound/pci/hda/patch_cs8409.c b/sound/pci/hda/patch_cs8409.c
index 272497b6cfcb..9db16b6292f4 100644
--- a/sound/pci/hda/patch_cs8409.c
+++ b/sound/pci/hda/patch_cs8409.c
@@ -708,6 +708,10 @@  static int cs42l42_jack_unsol_event(struct sub_codec *cs42l42)
 				cs42l42->mic_jack_in = 1;
 			}
 		}
+		/* Configure the HSDET mode. */
+		cs8409_i2c_write(cs42l42, 0x1120, 0x80);
+		/* Enable the HPOUT ground clamp and configure the HP pull-down */
+		cs8409_i2c_write(cs42l42, 0x1F06, 0x02);
 		/* Re-Enable Tip Sense Interrupt */
 		cs8409_i2c_write(cs42l42, 0x1320, 0xF3);
 	} else {
@@ -756,6 +760,8 @@  static void cs42l42_suspend(struct sub_codec *cs42l42)
 	unsigned int gpio_data;
 	int reg_cdc_status = 0;
 	const struct cs8409_i2c_param cs42l42_pwr_down_seq[] = {
+		{ 0x1F06, 0x02 },
+		{ 0x1129, 0x00 },
 		{ 0x2301, 0x3F },
 		{ 0x2302, 0x3F },
 		{ 0x2303, 0x3F },