ASoC: rt5651: Allow disabling jack-detect by calling set_jack(NULL)

Allow the machine driver to disable jack-detect over a suspend/resume by
calling snd_soc_component_set_jack(NULL).

Note this renames rt5651_set_jack, where all the jack-enable work was done
to rt5651_enable_jack_detect. This function can now no longer fail as it
does not request the IRQ anymore. It can still be passed an invalid jack
source, but that should never happen, so this is now logged and treated as
no jack source.

Cc: Carlo Caione <carlo@endlessm.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c
index 39d2c67cd0648f8e321af369a2ca6e76ca04981f..40bd1e70fee7efa2fd929544b104f8734024259c 100644 (file)
--- a/sound/soc/codecs/rt5651.c
+++ b/sound/soc/codecs/rt5651.c
@@ -1703,14 +1703,10 @@ static void rt5651_cancel_work(void *data)
        cancel_work_sync(&rt5651->jack_detect_work);
 }
 
-static int rt5651_set_jack(struct snd_soc_component *component,
-                          struct snd_soc_jack *hp_jack, void *data)
+static void rt5651_enable_jack_detect(struct snd_soc_component *component,
+                                     struct snd_soc_jack *hp_jack)
 {
        struct rt5651_priv *rt5651 = snd_soc_component_get_drvdata(component);
-       int ret;
-
-       if (!rt5651->irq)
-               return -EINVAL;
 
        /* IRQ output on GPIO1 */
        snd_soc_component_update_bits(component, RT5651_GPIO_CTRL1,
@@ -1737,10 +1733,10 @@ static int rt5651_set_jack(struct snd_soc_component *component,
                        RT5651_JD2_IRQ_EN, RT5651_JD2_IRQ_EN);
                break;
        case RT5651_JD_NULL:
-               return 0;
+               return;
        default:
                dev_err(component->dev, "Currently only JD1_1 / JD1_2 / JD2 are supported\n");
-               return -EINVAL;
+               return;
        }
 
        /* Enable jack detect power */
@@ -1774,19 +1770,28 @@ static int rt5651_set_jack(struct snd_soc_component *component,
                RT5651_MB1_OC_STKY_MASK, RT5651_MB1_OC_STKY_EN);
 
        rt5651->hp_jack = hp_jack;
-
-       ret = devm_request_threaded_irq(component->dev, rt5651->irq, NULL,
-                                       rt5651_irq,
-                                       IRQF_TRIGGER_RISING |
-                                       IRQF_TRIGGER_FALLING |
-                                       IRQF_ONESHOT, "rt5651", rt5651);
-       if (ret) {
-               dev_err(component->dev, "Failed to reguest IRQ: %d\n", ret);
-               return ret;
-       }
-
+       enable_irq(rt5651->irq);
        /* sync initial jack state */
        queue_work(system_power_efficient_wq, &rt5651->jack_detect_work);
+}
+
+static void rt5651_disable_jack_detect(struct snd_soc_component *component)
+{
+       struct rt5651_priv *rt5651 = snd_soc_component_get_drvdata(component);
+
+       disable_irq(rt5651->irq);
+       rt5651_cancel_work(rt5651);
+
+       rt5651->hp_jack = NULL;
+}
+
+static int rt5651_set_jack(struct snd_soc_component *component,
+                          struct snd_soc_jack *jack, void *data)
+{
+       if (jack)
+               rt5651_enable_jack_detect(component, jack);
+       else
+               rt5651_disable_jack_detect(component);
 
        return 0;
 }
@@ -2048,6 +2053,18 @@ static int rt5651_i2c_probe(struct i2c_client *i2c,
        if (ret)
                return ret;
 
+       ret = devm_request_irq(&i2c->dev, rt5651->irq, rt5651_irq,
+                              IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING
+                              | IRQF_ONESHOT, "rt5651", rt5651);
+       if (ret == 0) {
+               /* Gets re-enabled by rt5651_set_jack() */
+               disable_irq(rt5651->irq);
+       } else {
+               dev_warn(&i2c->dev, "Failed to reguest IRQ %d: %d\n",
+                        rt5651->irq, ret);
+               rt5651->irq = -ENXIO;
+       }
+
        ret = devm_snd_soc_register_component(&i2c->dev,
                                &soc_component_dev_rt5651,
                                rt5651_dai, ARRAY_SIZE(rt5651_dai));