| Message ID | 20230123135913.2720991-3-astrid.rost@axis.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9b271207ac83db362fac757d367923bde57dce86 |
| Headers | show |
| Series | ASoC: simple-card-utils: create jack inputs for aux_devs | expand |
On Mon, Jan 23, 2023 at 02:59:12PM +0100, Astrid Rost wrote: > 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> > --- > include/sound/simple_card_utils.h | 3 ++ > sound/soc/generic/simple-card-utils.c | 49 +++++++++++++++++++++++++++ > sound/soc/generic/simple-card.c | 4 +++ > 3 files changed, 56 insertions(+) Given that everyone is really supposed to be using the audio-graph cards for new systems this should be hooked up there too.
On 1/27/23 13:19, Mark Brown wrote: > On Mon, Jan 23, 2023 at 02:59:12PM +0100, Astrid Rost wrote: >> 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> >> --- >> include/sound/simple_card_utils.h | 3 ++ >> sound/soc/generic/simple-card-utils.c | 49 +++++++++++++++++++++++++++ >> sound/soc/generic/simple-card.c | 4 +++ >> 3 files changed, 56 insertions(+) > > Given that everyone is really supposed to be using the > audio-graph cards for new systems this should be hooked up there > too. Hello, Yes auxiliary devices are very useful, e.g. for GPIO. I can make a patch for audio-graph-card.c to add it. Best Regards Astrid
diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index 38590f1ae9ee..a3f3f3aa9e6e 100644 --- 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 e35becce9635..56552a616f21 100644 --- 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 feb55b66239b..e98932c16754 100644 --- 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; }
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> --- include/sound/simple_card_utils.h | 3 ++ sound/soc/generic/simple-card-utils.c | 49 +++++++++++++++++++++++++++ sound/soc/generic/simple-card.c | 4 +++ 3 files changed, 56 insertions(+)