As per the current implementation for GB codec driver, a jack list is maintained for each module. And it expects the list to be populated by the snd_soc_jack structure which would require modifications in mainstream code.
However, this is not a necessary requirement and the list can be easily maintained within gbaudio_module_info as well. This patch provides the relevant changes for the same.
Signed-off-by: Vaibhav Agarwal vaibhav.sr@gmail.com --- drivers/staging/greybus/audio_codec.c | 76 ++++++++++++++------------ drivers/staging/greybus/audio_codec.h | 10 +++- drivers/staging/greybus/audio_module.c | 20 ++++--- 3 files changed, 60 insertions(+), 46 deletions(-)
diff --git a/drivers/staging/greybus/audio_codec.c b/drivers/staging/greybus/audio_codec.c index ebf8484f0ae7..a2ee587e5a79 100644 --- a/drivers/staging/greybus/audio_codec.c +++ b/drivers/staging/greybus/audio_codec.c @@ -712,7 +712,7 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module, struct snd_soc_card *card) { int ret; - + struct gbaudio_jack *gba_jack, *n; struct snd_soc_jack *jack; struct snd_soc_jack_pin *headset, *button;
@@ -728,7 +728,8 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module,
headset->pin = module->jack_name; headset->mask = module->jack_mask; - jack = &module->headset_jack; + gba_jack = &module->headset; + jack = &gba_jack->jack;
ret = snd_soc_card_jack_new(card, module->jack_name, module->jack_mask, jack, headset, 1); @@ -737,6 +738,9 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module, return ret; }
+ /* Add to module's jack list */ + list_add(&gba_jack->list, &module->jack_list); + if (!module->button_mask) return 0;
@@ -745,20 +749,24 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module, button = devm_kzalloc(module->dev, sizeof(*headset), GFP_KERNEL); if (!button) { ret = -ENOMEM; - goto free_headset; + goto free_jack; }
button->pin = module->button_name; button->mask = module->button_mask; - jack = &module->button_jack; + gba_jack = &module->button; + jack = &gba_jack->jack;
ret = snd_soc_card_jack_new(card, module->button_name, module->button_mask, jack, button, 1); if (ret) { dev_err(module->dev, "Failed to create button jack\n"); - goto free_headset; + goto free_jack; }
+ /* Add to module's jack list */ + list_add(&gba_jack->list, &module->jack_list); + /* * Currently, max 4 buttons are supported with following key mapping * BTN_0 = KEY_MEDIA @@ -768,58 +776,55 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module, */
if (module->button_mask & SND_JACK_BTN_0) { - ret = snd_jack_set_key(module->button_jack.jack, SND_JACK_BTN_0, + ret = snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_MEDIA); if (ret) { dev_err(module->dev, "Failed to set BTN_0\n"); - goto free_button; + goto free_jack; } }
if (module->button_mask & SND_JACK_BTN_1) { - ret = snd_jack_set_key(module->button_jack.jack, SND_JACK_BTN_1, + ret = snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND); if (ret) { dev_err(module->dev, "Failed to set BTN_1\n"); - goto free_button; + goto free_jack; } }
if (module->button_mask & SND_JACK_BTN_2) { - ret = snd_jack_set_key(module->button_jack.jack, SND_JACK_BTN_2, + ret = snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); if (ret) { dev_err(module->dev, "Failed to set BTN_2\n"); - goto free_button; + goto free_jack; } }
if (module->button_mask & SND_JACK_BTN_3) { - ret = snd_jack_set_key(module->button_jack.jack, SND_JACK_BTN_3, + ret = snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); if (ret) { dev_err(module->dev, "Failed to set BTN_0\n"); - goto free_button; + goto free_jack; } }
/* FIXME * verify if this is really required set_bit(INPUT_PROP_NO_DUMMY_RELEASE, - module->button_jack.jack->input_dev->propbit); + module->button->jack->jack->input_dev->propbit); */
return 0;
-free_button: - jack = &module->button_jack; - snd_device_free(card->snd_card, jack->jack); - list_del(&jack->list); - -free_headset: - jack = &module->headset_jack; - snd_device_free(card->snd_card, jack->jack); - list_del(&jack->list); +free_jack: + list_for_each_entry_safe(gba_jack, n, &module->jack_list, list) { + jack = &gba_jack->jack; + snd_device_free(card->snd_card, jack->jack); + list_del(&gba_jack->list); + }
return ret; } @@ -829,6 +834,7 @@ int gbaudio_register_module(struct gbaudio_module_info *module) int ret; struct snd_soc_codec *codec; struct snd_card *card; + struct gbaudio_jack *gba_jack = NULL; struct snd_soc_jack *jack = NULL;
if (!gbcodec) { @@ -874,11 +880,10 @@ int gbaudio_register_module(struct gbaudio_module_info *module) * register jack devices for this module * from codec->jack_list */ - list_for_each_entry(jack, &codec->jack_list, list) { - if ((jack == &module->headset_jack) || - (jack == &module->button_jack)) - snd_device_register(codec->card->snd_card, - jack->jack); + list_for_each_entry(gba_jack, &module->jack_list, list) { + jack = &gba_jack->jack; + snd_device_register(codec->card->snd_card, + jack->jack); } #endif } @@ -962,7 +967,8 @@ void gbaudio_unregister_module(struct gbaudio_module_info *module) { struct snd_soc_codec *codec = gbcodec->codec; struct snd_card *card = codec->card->snd_card; - struct snd_soc_jack *jack, *next_j; + struct gbaudio_jack *gba_jack, *n; + struct snd_soc_jack *jack; int mask;
dev_dbg(codec->dev, "Unregister %s module\n", module->name); @@ -975,21 +981,21 @@ void gbaudio_unregister_module(struct gbaudio_module_info *module) mutex_unlock(&gbcodec->lock);
#ifdef CONFIG_SND_JACK - /* free jack devices for this module from codec->jack_list */ - list_for_each_entry_safe(jack, next_j, &component->card->jack_list, - list) { - if (jack == &module->headset_jack) + /* free jack devices for this module jack_list */ + list_for_each_entry_safe(gba_jack, n, &module->jack_list, list) { + if (gba_jack == &module->headset) mask = GBCODEC_JACK_MASK; - else if (jack == &module->button_jack) + else if (gba_jack == &module->button) mask = GBCODEC_JACK_BUTTON_MASK; else mask = 0; if (mask) { + jack = &gba_jack->jack; dev_dbg(module->dev, "Report %s removal\n", jack->jack->id); snd_soc_jack_report(jack, 0, mask); snd_device_free(codec->card->snd_card, jack->jack); - list_del(&jack->list); + list_del(&gba_jack->list); } } #endif diff --git a/drivers/staging/greybus/audio_codec.h b/drivers/staging/greybus/audio_codec.h index cb5d271da1a5..af9195eceb3a 100644 --- a/drivers/staging/greybus/audio_codec.h +++ b/drivers/staging/greybus/audio_codec.h @@ -106,6 +106,11 @@ enum gbaudio_module_state { GBAUDIO_MODULE_ON, };
+struct gbaudio_jack { + struct snd_soc_jack jack; + struct list_head list; +}; + struct gbaudio_module_info { /* module info */ struct device *dev; @@ -130,8 +135,8 @@ struct gbaudio_module_info { int jack_mask; int button_mask; int button_status; - struct snd_soc_jack headset_jack; - struct snd_soc_jack button_jack; + struct gbaudio_jack headset; + struct gbaudio_jack button;
/* connection info */ struct gb_connection *mgmt_connection; @@ -155,6 +160,7 @@ struct gbaudio_module_info { struct list_head widget_list; struct list_head ctl_list; struct list_head widget_ctl_list; + struct list_head jack_list;
struct gb_audio_topology *topology; }; diff --git a/drivers/staging/greybus/audio_module.c b/drivers/staging/greybus/audio_module.c index 300a2b4f3fc7..cdd4b6be5e9c 100644 --- a/drivers/staging/greybus/audio_module.c +++ b/drivers/staging/greybus/audio_module.c @@ -21,8 +21,10 @@ static int gbaudio_request_jack(struct gbaudio_module_info *module, struct gb_audio_jack_event_request *req) { int report; - struct snd_jack *jack = module->headset_jack.jack; - struct snd_jack *btn_jack = module->button_jack.jack; + struct snd_soc_jack *hs = &module->headset.jack; + struct snd_soc_jack *btn = &module->button.jack; + struct snd_jack *jack = hs->jack; + struct snd_jack *btn_jack = btn->jack;
if (!jack) { dev_err_ratelimited(module->dev, @@ -38,12 +40,10 @@ static int gbaudio_request_jack(struct gbaudio_module_info *module, if (req->event == GB_AUDIO_JACK_EVENT_REMOVAL) { module->jack_type = 0; if (btn_jack && module->button_status) { - snd_soc_jack_report(&module->button_jack, 0, - module->button_mask); + snd_soc_jack_report(btn, 0, module->button_mask); module->button_status = 0; } - snd_soc_jack_report(&module->headset_jack, 0, - module->jack_mask); + snd_soc_jack_report(hs, 0, module->jack_mask); return 0; }
@@ -61,7 +61,7 @@ static int gbaudio_request_jack(struct gbaudio_module_info *module, module->jack_type, report);
module->jack_type = report; - snd_soc_jack_report(&module->headset_jack, report, module->jack_mask); + snd_soc_jack_report(hs, report, module->jack_mask);
return 0; } @@ -70,7 +70,8 @@ static int gbaudio_request_button(struct gbaudio_module_info *module, struct gb_audio_button_event_request *req) { int soc_button_id, report; - struct snd_jack *btn_jack = module->button_jack.jack; + struct snd_soc_jack *btn = &module->button.jack; + struct snd_jack *btn_jack = btn->jack;
if (!btn_jack) { dev_err_ratelimited(module->dev, @@ -124,7 +125,7 @@ static int gbaudio_request_button(struct gbaudio_module_info *module,
module->button_status = report;
- snd_soc_jack_report(&module->button_jack, report, module->button_mask); + snd_soc_jack_report(btn, report, module->button_mask);
return 0; } @@ -258,6 +259,7 @@ static int gb_audio_probe(struct gb_bundle *bundle, INIT_LIST_HEAD(&gbmodule->widget_list); INIT_LIST_HEAD(&gbmodule->ctl_list); INIT_LIST_HEAD(&gbmodule->widget_ctl_list); + INIT_LIST_HEAD(&gbmodule->jack_list); gbmodule->dev = dev; snprintf(gbmodule->name, NAME_SIZE, "%s.%s", dev->driver->name, dev_name(dev));