ASoC: cs42l43: Add jack delay debounce after suspend

Hardware reports jack absent after reset/suspension regardless of jack
state, so introduce an additional delay only in suspension case to allow
proper detection to take place after a short delay.

Signed-off-by: Maciej Strozek <mstrozek@opensource.cirrus.com>
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/20250304140504.139245-1-mstrozek@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/cs42l43-jack.c b/sound/soc/codecs/cs42l43-jack.c
index d9ab003e166bfad49204070420483cbc93970a38..ac19a572fe70cb52d551089816fe07b9c05d751b 100644 (file)
--- a/sound/soc/codecs/cs42l43-jack.c
+++ b/sound/soc/codecs/cs42l43-jack.c
@@ -167,7 +167,7 @@ int cs42l43_set_jack(struct snd_soc_component *component,
                autocontrol |= 0x3 << CS42L43_JACKDET_MODE_SHIFT;
 
        ret = cs42l43_find_index(priv, "cirrus,tip-fall-db-ms", 500,
-                                NULL, cs42l43_accdet_db_ms,
+                                &priv->tip_fall_db_ms, cs42l43_accdet_db_ms,
                                 ARRAY_SIZE(cs42l43_accdet_db_ms));
        if (ret < 0)
                goto error;
@@ -175,7 +175,7 @@ int cs42l43_set_jack(struct snd_soc_component *component,
        tip_deb |= ret << CS42L43_TIPSENSE_FALLING_DB_TIME_SHIFT;
 
        ret = cs42l43_find_index(priv, "cirrus,tip-rise-db-ms", 500,
-                                NULL, cs42l43_accdet_db_ms,
+                                &priv->tip_rise_db_ms, cs42l43_accdet_db_ms,
                                 ARRAY_SIZE(cs42l43_accdet_db_ms));
        if (ret < 0)
                goto error;
@@ -764,6 +764,8 @@ void cs42l43_tip_sense_work(struct work_struct *work)
 error:
        mutex_unlock(&priv->jack_lock);
 
+       priv->suspend_jack_debounce = false;
+
        pm_runtime_mark_last_busy(priv->dev);
        pm_runtime_put_autosuspend(priv->dev);
 }
@@ -771,14 +773,19 @@ error:
 irqreturn_t cs42l43_tip_sense(int irq, void *data)
 {
        struct cs42l43_codec *priv = data;
+       unsigned int db_delay = priv->tip_debounce_ms;
 
        cancel_delayed_work(&priv->bias_sense_timeout);
        cancel_delayed_work(&priv->tip_sense_work);
        cancel_delayed_work(&priv->button_press_work);
        cancel_work(&priv->button_release_work);
 
+       // Ensure delay after suspend is long enough to avoid false detection
+       if (priv->suspend_jack_debounce)
+               db_delay += priv->tip_fall_db_ms + priv->tip_rise_db_ms;
+
        queue_delayed_work(system_long_wq, &priv->tip_sense_work,
-                          msecs_to_jiffies(priv->tip_debounce_ms));
+                          msecs_to_jiffies(db_delay));
 
        return IRQ_HANDLED;
 }

diff --git a/sound/soc/codecs/cs42l43.c b/sound/soc/codecs/cs42l43.c
index d2a2daefc2ec63e3edf0585c10f759026a371ab5..4257dbefe9dd105b6353608167e8137e06535446 100644 (file)
--- a/sound/soc/codecs/cs42l43.c
+++ b/sound/soc/codecs/cs42l43.c
@@ -2402,9 +2402,22 @@ static int cs42l43_codec_runtime_resume(struct device *dev)
        return 0;
 }
 
+static int cs42l43_codec_runtime_force_suspend(struct device *dev)
+{
+       struct cs42l43_codec *priv = dev_get_drvdata(dev);
+
+       dev_dbg(priv->dev, "Runtime suspend\n");
+
+       priv->suspend_jack_debounce = true;
+
+       pm_runtime_force_suspend(dev);
+
+       return 0;
+}
+
 static const struct dev_pm_ops cs42l43_codec_pm_ops = {
        RUNTIME_PM_OPS(NULL, cs42l43_codec_runtime_resume, NULL)
-       SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume)
+       SET_SYSTEM_SLEEP_PM_OPS(cs42l43_codec_runtime_force_suspend, pm_runtime_force_resume)
 };
 
 static const struct platform_device_id cs42l43_codec_id_table[] = {

diff --git a/sound/soc/codecs/cs42l43.h b/sound/soc/codecs/cs42l43.h
index 9c144e129535fa7f4b6ca3427df4418623f09481..1cd9d8a71c43934b42877fb94e9141fa4a86a19d 100644 (file)
--- a/sound/soc/codecs/cs42l43.h
+++ b/sound/soc/codecs/cs42l43.h
@@ -78,6 +78,8 @@ struct cs42l43_codec {
 
        bool use_ring_sense;
        unsigned int tip_debounce_ms;
+       unsigned int tip_fall_db_ms;
+       unsigned int tip_rise_db_ms;
        unsigned int bias_low;
        unsigned int bias_sense_ua;
        unsigned int bias_ramp_ms;
@@ -95,6 +97,7 @@ struct cs42l43_codec {
        bool button_detect_running;
        bool jack_present;
        int jack_override;
+       bool suspend_jack_debounce;
 
        struct work_struct hp_ilimit_work;
        struct delayed_work hp_ilimit_clear_work;