]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: cs42l43: Disable headphone clamps during type detection
authorCharles Keepax <ckeepax@opensource.cirrus.com>
Wed, 23 Apr 2025 09:09:44 +0000 (10:09 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 May 2025 09:13:51 +0000 (11:13 +0200)
[ Upstream commit 70ad2e6bd180f94be030aef56e59693e36d945f3 ]

The headphone clamps cause fairly loud pops during type detect
because they sink current from the detection process itself. Disable
the clamps whilst the type detect runs, to improve the detection
pop performance.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/20250423090944.1504538-1-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/codecs/cs42l43-jack.c

index 20e6ab6f0d4ad7a04be004330f715f1ac9fb6a73..6165ac16c3a950aa10666e026a889570e90fe2ee 100644 (file)
@@ -654,6 +654,10 @@ static int cs42l43_run_type_detect(struct cs42l43_codec *priv)
 
        reinit_completion(&priv->type_detect);
 
+       regmap_update_bits(cs42l43->regmap, CS42L43_STEREO_MIC_CLAMP_CTRL,
+                          CS42L43_SMIC_HPAMP_CLAMP_DIS_FRC_VAL_MASK,
+                          CS42L43_SMIC_HPAMP_CLAMP_DIS_FRC_VAL_MASK);
+
        cs42l43_start_hs_bias(priv, true);
        regmap_update_bits(cs42l43->regmap, CS42L43_HS2,
                           CS42L43_HSDET_MODE_MASK, 0x3 << CS42L43_HSDET_MODE_SHIFT);
@@ -665,6 +669,9 @@ static int cs42l43_run_type_detect(struct cs42l43_codec *priv)
                           CS42L43_HSDET_MODE_MASK, 0x2 << CS42L43_HSDET_MODE_SHIFT);
        cs42l43_stop_hs_bias(priv);
 
+       regmap_update_bits(cs42l43->regmap, CS42L43_STEREO_MIC_CLAMP_CTRL,
+                          CS42L43_SMIC_HPAMP_CLAMP_DIS_FRC_VAL_MASK, 0);
+
        if (!time_left)
                return -ETIMEDOUT;