| Message ID | 20230118125226.333214-4-astrid.rost@axis.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ASoC: simple-card-utils: jack for aux_devs | expand |
On 1/18/2023 1:52 PM, Astrid Rost wrote: > Add set_jack and get_jack_supported_type > to allow simple-card-utils to add a jack for it. > > Signed-off-by: Astrid Rost <astrid.rost@axis.com> > --- > sound/soc/codecs/ts3a227e.c | 17 ++++++++++++++++- > 1 file changed, 16 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/codecs/ts3a227e.c b/sound/soc/codecs/ts3a227e.c > index 2305a472d132..212dfd2b60ed 100644 > --- a/sound/soc/codecs/ts3a227e.c > +++ b/sound/soc/codecs/ts3a227e.c > @@ -258,7 +258,22 @@ int ts3a227e_enable_jack_detect(struct snd_soc_component *component, > } > EXPORT_SYMBOL_GPL(ts3a227e_enable_jack_detect); > > -static struct snd_soc_component_driver ts3a227e_soc_driver; > +static int ts3a227e_set_jack(struct snd_soc_component *component, > + struct snd_soc_jack *jack, void *data) > +{ > + return ts3a227e_enable_jack_detect(component, jack); > +} Patch looks ok, but it seems that ts3a227e_enable_jack_detect() doesn't check if jack is NULL, before calling snd_jack_set_key() I guess this should be also fixed, as _set_jack can be called with jack being NULL to disable jack detection. Optionally, while set_jack is being added I would also just get rid of EXPORT_SYMBOL_GPL(ts3a227e_enable_jack_detect); and convert all other users to snd_soc_component_set_jack as it currently serves as bad example. > + > +static int ts3a227e_get_supported_jack_type(struct snd_soc_component *component) > +{ > + return TS3A227E_JACK_MASK; > +} > + > +static const struct snd_soc_component_driver ts3a227e_soc_driver = { > + .name = "ti,ts3a227e", > + .set_jack = ts3a227e_set_jack, > + .get_jack_supported_type = ts3a227e_get_supported_jack_type, > +}; > > static const struct regmap_config ts3a227e_regmap_config = { > .val_bits = 8,
diff --git a/sound/soc/codecs/ts3a227e.c b/sound/soc/codecs/ts3a227e.c index 2305a472d132..212dfd2b60ed 100644 --- a/sound/soc/codecs/ts3a227e.c +++ b/sound/soc/codecs/ts3a227e.c @@ -258,7 +258,22 @@ int ts3a227e_enable_jack_detect(struct snd_soc_component *component, } EXPORT_SYMBOL_GPL(ts3a227e_enable_jack_detect); -static struct snd_soc_component_driver ts3a227e_soc_driver; +static int ts3a227e_set_jack(struct snd_soc_component *component, + struct snd_soc_jack *jack, void *data) +{ + return ts3a227e_enable_jack_detect(component, jack); +} + +static int ts3a227e_get_supported_jack_type(struct snd_soc_component *component) +{ + return TS3A227E_JACK_MASK; +} + +static const struct snd_soc_component_driver ts3a227e_soc_driver = { + .name = "ti,ts3a227e", + .set_jack = ts3a227e_set_jack, + .get_jack_supported_type = ts3a227e_get_supported_jack_type, +}; static const struct regmap_config ts3a227e_regmap_config = { .val_bits = 8,
Add set_jack and get_jack_supported_type to allow simple-card-utils to add a jack for it. Signed-off-by: Astrid Rost <astrid.rost@axis.com> --- sound/soc/codecs/ts3a227e.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)