ASoC: codecs: rt298: 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-4-amadeuszx.slawinski@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c
index c291786dc82def3e777841b7f11aaff977f2ba37..1a27e5e63289c0f4964dcf5fc5665484c2506d14 100644 (file)
--- a/sound/soc/codecs/rt298.c
+++ b/sound/soc/codecs/rt298.c
@@ -326,7 +326,8 @@ static void rt298_jack_detect_work(struct work_struct *work)
                SND_JACK_MICROPHONE | SND_JACK_HEADPHONE);
 }
 
-int rt298_mic_detect(struct snd_soc_component *component, struct snd_soc_jack *jack)
+static int rt298_mic_detect(struct snd_soc_component *component,
+                           struct snd_soc_jack *jack, void *data)
 {
        struct rt298_priv *rt298 = snd_soc_component_get_drvdata(component);
        struct snd_soc_dapm_context *dapm;
@@ -358,7 +359,6 @@ int rt298_mic_detect(struct snd_soc_component *component, struct snd_soc_jack *j
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(rt298_mic_detect);
 
 static int is_mclk_mode(struct snd_soc_dapm_widget *source,
                         struct snd_soc_dapm_widget *sink)
@@ -1011,17 +1011,11 @@ static int rt298_probe(struct snd_soc_component *component)
        struct rt298_priv *rt298 = snd_soc_component_get_drvdata(component);
 
        rt298->component = component;
+       INIT_DELAYED_WORK(&rt298->jack_detect_work, rt298_jack_detect_work);
 
-       if (rt298->i2c->irq) {
-               regmap_update_bits(rt298->regmap,
-                                       RT298_IRQ_CTRL, 0x2, 0x2);
-
-               INIT_DELAYED_WORK(&rt298->jack_detect_work,
-                                       rt298_jack_detect_work);
+       if (rt298->i2c->irq)
                schedule_delayed_work(&rt298->jack_detect_work,
-                                       msecs_to_jiffies(1250));
-       }
-
+                                     msecs_to_jiffies(1250));
        return 0;
 }
 
@@ -1120,6 +1114,7 @@ static const struct snd_soc_component_driver soc_component_dev_rt298 = {
        .suspend                = rt298_suspend,
        .resume                 = rt298_resume,
        .set_bias_level         = rt298_set_bias_level,
+       .set_jack               = rt298_mic_detect,
        .controls               = rt298_snd_controls,
        .num_controls           = ARRAY_SIZE(rt298_snd_controls),
        .dapm_widgets           = rt298_dapm_widgets,

diff --git a/sound/soc/codecs/rt298.h b/sound/soc/codecs/rt298.h
index ed2b8fd87f4c6ee44f43b5c44032516b5f7613a0..f1be9c13540120ea8441c558635fd72b560ce5e6 100644 (file)
--- a/sound/soc/codecs/rt298.h
+++ b/sound/soc/codecs/rt298.h
@@ -207,7 +207,5 @@ enum {
        RT298_AIFS,
 };
 
-int rt298_mic_detect(struct snd_soc_component *component, struct snd_soc_jack *jack);
-
 #endif /* __RT298_H__ */
 

diff --git a/sound/soc/intel/boards/bxt_rt298.c b/sound/soc/intel/boards/bxt_rt298.c
index 75995d17597d9527ccaaec6f80d96e6648747a58..4bd93c3ba3777046267e47442b415ee64302ef2a 100644 (file)
--- a/sound/soc/intel/boards/bxt_rt298.c
+++ b/sound/soc/intel/boards/bxt_rt298.c
@@ -176,7 +176,7 @@ static int broxton_rt298_codec_init(struct snd_soc_pcm_runtime *rtd)
        if (ret)
                return ret;
 
-       rt298_mic_detect(component, &broxton_headset);
+       snd_soc_component_set_jack(component, &broxton_headset, NULL);
 
        snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "SoC DMIC");