Skip to content

Commit d1d6fa0

Browse files
charleskeepaxgregkh
authored andcommitted
ASoC: cs42l43: Reset clamp override on jack removal
[ Upstream commit 5fc7d2b ] Some of the manually selected jack configurations will disable the headphone clamp override. Restore this on jack removal, such that the state is consistent for a new insert. Fixes: fc918cb ("ASoC: cs42l43: Add support for the cs42l43") Signed-off-by: Charles Keepax <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent efeddd8 commit d1d6fa0

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

sound/soc/codecs/cs42l43-jack.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -690,6 +690,9 @@ static void cs42l43_clear_jack(struct cs42l43_codec *priv)
690690
CS42L43_PGA_WIDESWING_MODE_EN_MASK, 0);
691691
regmap_update_bits(cs42l43->regmap, CS42L43_STEREO_MIC_CTRL,
692692
CS42L43_JACK_STEREO_CONFIG_MASK, 0);
693+
regmap_update_bits(cs42l43->regmap, CS42L43_STEREO_MIC_CLAMP_CTRL,
694+
CS42L43_SMIC_HPAMP_CLAMP_DIS_FRC_MASK,
695+
CS42L43_SMIC_HPAMP_CLAMP_DIS_FRC_MASK);
693696
regmap_update_bits(cs42l43->regmap, CS42L43_HS2,
694697
CS42L43_HSDET_MODE_MASK | CS42L43_HSDET_MANUAL_MODE_MASK,
695698
0x2 << CS42L43_HSDET_MODE_SHIFT);

0 commit comments

Comments
 (0)