ASoC: cs42l43: Don't enable bias sense during type detect
Subsystems (3)
PATCH 1/2 ASoC: cs42l43: Don't enable bias sense during type detect
Alas on some headsets the bias sense can cause problems with the type detection. It can occasionally be falsely triggered by the type detect itself and as the clamp is applied when this happens, it will cause a headset to be incorrectly identified as headphones. As such it should be disabled whilst running type detect. This does mean a jack removal during type detect will cause a larger click but that is unfortunately unavoidable.
--- sound/soc/codecs/cs42l43-jack.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
sound/soc/codecs/cs42l43-jack.c +12 -11
@@ -237,7 +237,7 @@ int cs42l43_set_jack(struct snd_soc_component *component,return ret; } -static void cs42l43_start_hs_bias (struct cs42l43_codec *priv,bool force_high) +static void cs42l43_start_hs_bias (struct cs42l43_codec *priv,bool type_detect) {struct cs42l43 *cs42l43 = priv->core;unsigned int val =0x3 <<CS42L43_HSBIAS_MODE_SHIFT ;
@@ -247,16 +247,17 @@ static void cs42l43_start_hs_bias(struct cs42l43_codec *priv, bool force_high)regmap_update_bits (cs42l43->regmap,CS42L43_HS2 ,CS42L43_HS_CLAMP_DISABLE_MASK ,CS42L43_HS_CLAMP_DISABLE_MASK ); -if (!force_high && priv->bias_low) - val =0x2 <<CS42L43_HSBIAS_MODE_SHIFT ; - -if (priv->bias_sense_ua) { -regmap_update_bits (cs42l43->regmap, -CS42L43_HS_BIAS_SENSE_AND_CLAMP_AUTOCONTROL , -CS42L43_HSBIAS_SENSE_EN_MASK | -CS42L43_AUTO_HSBIAS_CLAMP_EN_MASK , -CS42L43_HSBIAS_SENSE_EN_MASK | -CS42L43_AUTO_HSBIAS_CLAMP_EN_MASK ); +if (!type_detect) { +if (priv->bias_low) + val =0x2 <<CS42L43_HSBIAS_MODE_SHIFT ; + +if (priv->bias_sense_ua) +regmap_update_bits (cs42l43->regmap, +CS42L43_HS_BIAS_SENSE_AND_CLAMP_AUTOCONTROL , +CS42L43_HSBIAS_SENSE_EN_MASK | +CS42L43_AUTO_HSBIAS_CLAMP_EN_MASK , +CS42L43_HSBIAS_SENSE_EN_MASK | +CS42L43_AUTO_HSBIAS_CLAMP_EN_MASK ); } regmap_update_bits(cs42l43->regmap, CS42L43_MIC_DETECT_CONTROL_1,
Signature · 1 line
2.39.2
PATCH 2/2 ASoC: cs42l43: Allow HP amp to cool off after current limit
Whilst occasional current limiting is fine, constant current limiting should be avoided. Add a back off system that will disable the headphone amp, if a lot of current limiting is seen in a short window of time.
--- sound/soc/codecs/cs42l43-jack.c | 4 +- sound/soc/codecs/cs42l43.c | 88 +++++++++++++++++++++++++++++++-- sound/soc/codecs/cs42l43.h | 9 ++++ 3 files changed, 96 insertions(+), 5 deletions(-)
sound/soc/codecs/cs42l43-jack.c +2 -2
@@ -507,7 +507,7 @@ static void cs42l43_start_load_detect(struct cs42l43_codec *priv) priv->load_detect_running = true; -if (priv->hp_ena) { +if (priv->hp_ena && !priv->hp_ilimited) {unsigned long time_left;reinit_completion (&priv->hp_shutdown);
@@ -572,7 +572,7 @@ static void cs42l43_stop_load_detect(struct cs42l43_codec *priv)CS42L43_ADC1_EN_MASK |CS42L43_ADC2_EN_MASK , priv->adc_ena); -if (priv->hp_ena) { +if (priv->hp_ena && !priv->hp_ilimited) {unsigned long time_left;reinit_completion (&priv->hp_startup);
sound/soc/codecs/cs42l43.c +85 -3
112 lines not on this page · raw message
sound/soc/codecs/cs42l43.h +9 -0
@@ -28,6 +28,10 @@#define CS42L43_HP_TIMEOUT_MS 2000#define CS42L43_LOAD_TIMEOUT_MS 1000 +#define CS42L43_HP_ILIMIT_BACKOFF_MS 1000 +#define CS42L43_HP_ILIMIT_DECAY_MS 300 +#define CS42L43_HP_ILIMIT_MAX_COUNT 4 +#define CS42L43_ASP_MAX_CHANNELS 6#define CS42L43_N_EQ_COEFFS 15
@@ -88,6 +92,11 @@ struct cs42l43_codec {bool button_detect_running;bool jack_present;int jack_override; + +struct work_struct hp_ilimit_work; +struct delayed_work hp_ilimit_clear_work; +bool hp_ilimited; +int hp_ilimit_count; };#if IS_REACHABLE (CONFIG_SND_SOC_CS42L43_SDW )
Signature · 1 line
2.39.2
Mark Brown
maintainerRe: (subset) [PATCH 1/2] ASoC: cs42l43: Don't enable bias sense during type detect
In reply to Charles KeepaxQuoted 9 lines · Charles Keepax
Alas on some headsets the bias sense can cause problems with the type detection. It can occasionally be falsely triggered by the type detect itself and as the clamp is applied when this happens, it will cause a headset to be incorrectly identified as headphones. As such it should be disabled whilst running type detect. This does mean a jack removal during type detect will cause a larger click but that is unfortunately unavoidable.
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] ASoC: cs42l43: Don't enable bias sense during type detect
commit: dc96528b176fa6e55a3dc01060fe9d97be450ce9
[2/2] ASoC: cs42l43: Allow HP amp to cool off after current limit
commit: bbbc18d8c27cc9d40cc9a3b03b61e4df85311146All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark