Skip to content

Commit 0ba76fb

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 36e0ea1 commit 0ba76fb

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
@@ -702,6 +702,9 @@ static void cs42l43_clear_jack(struct cs42l43_codec *priv)
702702
CS42L43_PGA_WIDESWING_MODE_EN_MASK, 0);
703703
regmap_update_bits(cs42l43->regmap, CS42L43_STEREO_MIC_CTRL,
704704
CS42L43_JACK_STEREO_CONFIG_MASK, 0);
705+
regmap_update_bits(cs42l43->regmap, CS42L43_STEREO_MIC_CLAMP_CTRL,
706+
CS42L43_SMIC_HPAMP_CLAMP_DIS_FRC_MASK,
707+
CS42L43_SMIC_HPAMP_CLAMP_DIS_FRC_MASK);
705708
regmap_update_bits(cs42l43->regmap, CS42L43_HS2,
706709
CS42L43_HSDET_MODE_MASK | CS42L43_HSDET_MANUAL_MODE_MASK,
707710
0x2 << CS42L43_HSDET_MODE_SHIFT);

0 commit comments

Comments
 (0)