ASoC: codecs: rt286: Reorganize jack detect handling

Clean up in order to use and expose .set_jack callback.

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20220609133541.3984886-3-amadeuszx.slawinski@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c
index ad8ea1fa7c2322a4b97b978b2204984d0d07804f..0534a073ee695974c2444e74ca7ca8648fb87e81 100644 (file)
--- a/sound/soc/codecs/rt286.c
+++ b/sound/soc/codecs/rt286.c
@@ -311,7 +311,8 @@ static void rt286_jack_detect_work(struct work_struct *work)
                SND_JACK_MICROPHONE | SND_JACK_HEADPHONE);
 }
 
-int rt286_mic_detect(struct snd_soc_component *component, struct snd_soc_jack *jack)
+static int rt286_mic_detect(struct snd_soc_component *component,
+                           struct snd_soc_jack *jack, void *data)
 {
        struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
        struct rt286_priv *rt286 = snd_soc_component_get_drvdata(component);
@@ -335,7 +336,6 @@ int rt286_mic_detect(struct snd_soc_component *component, struct snd_soc_jack *j
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(rt286_mic_detect);
 
 static int is_mclk_mode(struct snd_soc_dapm_widget *source,
                         struct snd_soc_dapm_widget *sink)
@@ -947,17 +947,11 @@ static int rt286_probe(struct snd_soc_component *component)
        struct rt286_priv *rt286 = snd_soc_component_get_drvdata(component);
 
        rt286->component = component;
+       INIT_DELAYED_WORK(&rt286->jack_detect_work, rt286_jack_detect_work);
 
-       if (rt286->i2c->irq) {
-               regmap_update_bits(rt286->regmap,
-                                       RT286_IRQ_CTRL, 0x2, 0x2);
-
-               INIT_DELAYED_WORK(&rt286->jack_detect_work,
-                                       rt286_jack_detect_work);
+       if (rt286->i2c->irq)
                schedule_delayed_work(&rt286->jack_detect_work,
-                                       msecs_to_jiffies(1250));
-       }
-
+                                     msecs_to_jiffies(50));
        return 0;
 }
 
@@ -1055,6 +1049,7 @@ static const struct snd_soc_component_driver soc_component_dev_rt286 = {
        .suspend                = rt286_suspend,
        .resume                 = rt286_resume,
        .set_bias_level         = rt286_set_bias_level,
+       .set_jack               = rt286_mic_detect,
        .controls               = rt286_snd_controls,
        .num_controls           = ARRAY_SIZE(rt286_snd_controls),
        .dapm_widgets           = rt286_dapm_widgets,

diff --git a/sound/soc/codecs/rt286.h b/sound/soc/codecs/rt286.h
index f27a4e71d5b6fb04e232f7e7ca433c8601da30e8..4b7a3bd6043d76c88faf2df0b0a8ee418f45edea 100644 (file)
--- a/sound/soc/codecs/rt286.h
+++ b/sound/soc/codecs/rt286.h
@@ -196,7 +196,5 @@ enum {
        RT286_AIFS,
 };
 
-int rt286_mic_detect(struct snd_soc_component *component, struct snd_soc_jack *jack);
-
 #endif /* __RT286_H__ */
 

diff --git a/sound/soc/intel/boards/broadwell.c b/sound/soc/intel/boards/broadwell.c
index b29d77dfb28138edebbb6d7db8d0a789491f090c..48bf3241b3e63c23b1b78de78c947f3107aec3a0 100644 (file)
--- a/sound/soc/intel/boards/broadwell.c
+++ b/sound/soc/intel/boards/broadwell.c
@@ -75,7 +75,7 @@ static int broadwell_rt286_codec_init(struct snd_soc_pcm_runtime *rtd)
        if (ret)
                return ret;
 
-       rt286_mic_detect(component, &broadwell_headset);
+       snd_soc_component_set_jack(component, &broadwell_headset, NULL);
        return 0;
 }
 
@@ -235,7 +235,7 @@ static void broadwell_disable_jack(struct snd_soc_card *card)
                if (!strcmp(component->name, "i2c-INT343A:00")) {
 
                        dev_dbg(component->dev, "disabling jack detect before going to suspend.\n");
-                       rt286_mic_detect(component, NULL);
+                       snd_soc_component_set_jack(component, NULL, NULL);
                        break;
                }
        }
@@ -255,7 +255,7 @@ static int broadwell_resume(struct snd_soc_card *card){
                if (!strcmp(component->name, "i2c-INT343A:00")) {
 
                        dev_dbg(component->dev, "enabling jack detect for resume.\n");
-                       rt286_mic_detect(component, &broadwell_headset);
+                       snd_soc_component_set_jack(component, &broadwell_headset, NULL);
                        break;
                }
        }

diff --git a/sound/soc/intel/boards/skl_rt286.c b/sound/soc/intel/boards/skl_rt286.c
index e9f9520dcea43a870bf3b8020a3b2ff66d87ec01..4f3d655e2bfa8dd79d6952bee9ed73ea638de2be 100644 (file)
--- a/sound/soc/intel/boards/skl_rt286.c
+++ b/sound/soc/intel/boards/skl_rt286.c
@@ -133,7 +133,7 @@ static int skylake_rt286_codec_init(struct snd_soc_pcm_runtime *rtd)
        if (ret)
                return ret;
 
-       rt286_mic_detect(component, &skylake_headset);
+       snd_soc_component_set_jack(component, &skylake_headset, NULL);
 
        snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "SoC DMIC");