ASoC: simple-card-utils: create jack inputs for aux_devs

Add a generic way to create jack inputs for auxiliary jack detection
drivers (e.g. via i2c, spi), which are not part of any real codec.
The simple-card can be used as combining card driver to add the jacks,
no new one is required.

Create a jack (for input-events) for jack devices in the auxiliary
device list (aux_devs). A device which returns a valid value on
get_jack_type counts as jack device; set_jack is required
to add the jack to the device.

Signed-off-by: Astrid Rost <astrid.rost@axis.com>
Link: https://lore.kernel.org/r/20230123135913.2720991-3-astrid.rost@axis.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h
index 38590f1..a3f3f3a 100644 (file)
--- a/include/sound/simple_card_utils.h
+++ b/include/sound/simple_card_utils.h
@@ -69,6 +69,7 @@ struct asoc_simple_priv {
        } *dai_props;
        struct asoc_simple_jack hp_jack;
        struct asoc_simple_jack mic_jack;
+       struct snd_soc_jack *aux_jacks;
        struct snd_soc_dai_link *dai_link;
        struct asoc_simple_dai *dais;
        struct snd_soc_dai_link_component *dlcs;
@@ -187,6 +188,8 @@ int asoc_simple_parse_pin_switches(struct snd_soc_card *card,
 int asoc_simple_init_jack(struct snd_soc_card *card,
                               struct asoc_simple_jack *sjack,
                               int is_hp, char *prefix, char *pin);
+int asoc_simple_init_aux_jacks(struct asoc_simple_priv *priv,
+                               char *prefix);
 int asoc_simple_init_priv(struct asoc_simple_priv *priv,
                               struct link_info *li);
 int asoc_simple_remove(struct platform_device *pdev);

diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index e35becc..56552a6 100644 (file)
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -786,6 +786,55 @@ int asoc_simple_init_jack(struct snd_soc_card *card,
 }
 EXPORT_SYMBOL_GPL(asoc_simple_init_jack);
 
+int asoc_simple_init_aux_jacks(struct asoc_simple_priv *priv, char *prefix)
+{
+       struct snd_soc_card *card = simple_priv_to_card(priv);
+       struct snd_soc_component *component;
+       int found_jack_index = 0;
+       int type = 0;
+       int num = 0;
+       int ret;
+
+       if (priv->aux_jacks)
+               return 0;
+
+       for_each_card_auxs(card, component) {
+               type = snd_soc_component_get_jack_type(component);
+               if (type > 0)
+                       num++;
+       }
+       if (num < 1)
+               return 0;
+
+       priv->aux_jacks = devm_kcalloc(card->dev, num,
+                                      sizeof(struct snd_soc_jack), GFP_KERNEL);
+       if (!priv->aux_jacks)
+               return -ENOMEM;
+
+       for_each_card_auxs(card, component) {
+               char id[128];
+               struct snd_soc_jack *jack;
+
+               if (found_jack_index >= num)
+                       break;
+
+               type = snd_soc_component_get_jack_type(component);
+               if (type <= 0)
+                       continue;
+
+               /* create jack */
+               jack = &(priv->aux_jacks[found_jack_index++]);
+               snprintf(id, sizeof(id), "%s-jack", component->name);
+               ret = snd_soc_card_jack_new(card, id, type, jack);
+               if (ret)
+                       continue;
+
+               (void)snd_soc_component_set_jack(component, jack, NULL);
+       }
+       return 0;
+}
+EXPORT_SYMBOL_GPL(asoc_simple_init_aux_jacks);
+
 int asoc_simple_init_priv(struct asoc_simple_priv *priv,
                          struct link_info *li)
 {

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index feb55b6..e98932c 100644 (file)
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -623,6 +623,10 @@ static int simple_soc_probe(struct snd_soc_card *card)
        if (ret < 0)
                return ret;
 
+       ret = asoc_simple_init_aux_jacks(priv, PREFIX);
+       if (ret < 0)
+               return ret;
+
        return 0;
 }