Enable Greybus Audio codec driver
Subsystems (3)
Vaibhav Agarwal
maintainerv4 cover Enable Greybus Audio codec driver
The existing GB Audio codec driver is dependent on MSM8994 Audio driver. During the development stage, this dependency was configured due to various changes involved in MSM Audio driver to enable addtional codec card and some of the changes proposed in mainline ASoC framework. However, these are not the real dependencies and some of them can be easily removed.
The folowing patch series includes the changes to resolve unnecessary depedencies and make the codec driver functional with the latest kernel.
Patch 1,2: Incudes jack framework related changes.
Patch 3,4,5: Resolves compilation error observed with the latest kernel and also provides helper APIs required to allow dynamic addition/removal of modules.
Patch 6: Finally provides config options and related Makefile changes to enable GB Codec driver.
Thanks to Alexandre for raising the headsup [1] and motivating me to provide the necessary changes.
This patchset is intended to resolve the componentization issue only. And as per the suggestion [2] from Mark, I'll share a separate patch series aligned to ASoC tree. Once the relevant changes are accepted in snd-soc framework, I'll share relevant patches to pull GB Audio out of the staging tree.
v1:
- Include the changes for the review comments suggested by Dan
- Rebase to latest staging-next
v2:
- Avoid defining unused 'update' pointer
- Fix the missing connect bool value required during mixer_update_power
- Added Reviewed-by tag from Dan
- Rebase to latest staging-next
v3:
- Fix the warnings reported by lkp[3]
- Rebase to latest staging-next
[1] https://lore.kernel.org/lkml/[email protected]/
[2] https://lore.kernel.org/alsa-devel/[email protected]/
[3] https://lore.kernel.org/lkml/202006200150.mNVj1Duq%[email protected]/
Vaibhav Agarwal (7):
staging: greybus: audio: Update snd_jack FW usage as per new APIs
staging: greybus: audio: Maintain jack list within GB Audio module
staging: greybus: audio: Resolve compilation errors for GB codec
module
staging: greybus: audio: Resolve compilation error in topology parser
staging: greybus: audio: Add helper APIs for dynamic audio modules
staging: greybus: audio: Enable GB codec, audio module compilation.
drivers: staging: audio: Fix the missing header file for helper file
drivers/staging/greybus/Kconfig | 14 +- drivers/staging/greybus/Makefile | 6 +- drivers/staging/greybus/audio_codec.c | 178 +++++++++++--------- drivers/staging/greybus/audio_codec.h | 12 +- drivers/staging/greybus/audio_helper.c | 198 +++++++++++++++++++++++ drivers/staging/greybus/audio_helper.h | 17 ++ drivers/staging/greybus/audio_module.c | 15 +- drivers/staging/greybus/audio_topology.c | 131 +++++++-------- 8 files changed, 414 insertions(+), 157 deletions(-) create mode 100644 drivers/staging/greybus/audio_helper.c create mode 100644 drivers/staging/greybus/audio_helper.h
base-commit: 14442181d20490945f341644bb8257e334b01447
Signature · 1 line
2.27.0
Vaibhav Agarwal
maintainerPATCH v4 1/7 staging: greybus: audio: Update snd_jack FW usage as per new APIs
snd_soc_jack APIs are modified in recent kernel versions. This patch updates the codec driver to resolve the compilation errors related to jack framework.
--- drivers/staging/greybus/audio_codec.c | 54 +++++++++++++++++++++------ 1 file changed, 42 insertions(+), 12 deletions(-)
drivers/staging/greybus/audio_codec.c +42 -12
@@ -709,17 +709,26 @@ static struct snd_soc_dai_driver gbaudio_dai[] = { };static int gbaudio_init_jack (struct gbaudio_module_info *module, -struct snd_soc_codec *codec) +struct snd_soc_card *card) {int ret; +struct snd_soc_jack_pin *headset, *button;if (!module->jack_mask)return 0 ;snprintf (module->jack_name,NAME_SIZE ,"GB %d Headset Jack" , module->dev_id); - ret =snd_soc_jack_new (codec, module->jack_name, module->jack_mask, - &module->headset_jack); + + headset =devm_kzalloc (module->dev,sizeof (*headset),GFP_KERNEL ); +if (!headset) +return -ENOMEM ; + + headset->pin = module->jack_name; + headset->mask = module->jack_mask; + + ret =snd_soc_card_jack_new (card, module->jack_name, module->jack_mask, + &module->headset_jack, headset,1 );if (ret) {dev_err (module->dev,"Failed to create new jack\n" );return ret;
@@ -730,11 +739,21 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module,snprintf (module->button_name,NAME_SIZE ,"GB %d Button Jack" , module->dev_id); - ret =snd_soc_jack_new (codec, module->button_name, module->button_mask, - &module->button_jack); + button =devm_kzalloc (module->dev,sizeof (*button),GFP_KERNEL ); +if (!button) { + ret = -ENOMEM ; + goto free_headset; + } + + button->pin = module->button_name; + button->mask = module->button_mask; + + ret =snd_soc_card_jack_new (card, module->button_name, + module->button_mask, &module->button_jack, + button,1 );if (ret) {dev_err (module->dev,"Failed to create button jack\n" ); -return ret; + goto free_headset; }/*
@@ -750,7 +769,7 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module, KEY_MEDIA);if (ret) {dev_err (module->dev,"Failed to set BTN_0\n" ); -return ret; + goto free_button; } }
@@ -759,7 +778,7 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module, KEY_VOICECOMMAND);if (ret) {dev_err (module->dev,"Failed to set BTN_1\n" ); -return ret; + goto free_button; } }
@@ -768,7 +787,7 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module, KEY_VOLUMEUP);if (ret) {dev_err (module->dev,"Failed to set BTN_2\n" ); -return ret; + goto free_button; } }
@@ -777,7 +796,7 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module, KEY_VOLUMEDOWN);if (ret) {dev_err (module->dev,"Failed to set BTN_0\n" ); -return ret; + goto free_button; } }
@@ -788,6 +807,16 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module,*/ return 0 ; + +free_button: +snd_device_free (card->snd_card, module->button_jack.jack); +list_del (&module->button_jack.list); + +free_headset: +snd_device_free (card->snd_card, module->headset_jack.jack); +list_del (&module->headset_jack.list); + +return ret; }int gbaudio_register_module (struct gbaudio_module_info *module)
@@ -815,7 +844,7 @@ int gbaudio_register_module(struct gbaudio_module_info *module)return -EINVAL ; } - ret =gbaudio_init_jack (module, codec); + ret =gbaudio_init_jack (module, component->card);if (ret) {up_write (&card->controls_rwsem);return ret;
@@ -942,7 +971,8 @@ void gbaudio_unregister_module(struct gbaudio_module_info *module)#ifdef CONFIG_SND_JACK /* free jack devices for this module from codec->jack_list */ -list_for_each_entry_safe (jack, next_j, &codec->jack_list, list) { +list_for_each_entry_safe (jack, next_j, &component->card->jack_list, + list) {if (jack == &module->headset_jack) mask =GBCODEC_JACK_MASK ;else if (jack == &module->button_jack)
Signature · 1 line
2.27.0
Re: [greybus-dev] [PATCH v4 1/7] staging: greybus: audio: Update snd_jack FW usage as per new APIs
Quoted 3 lines · Vaibhav Agarwal
snd_soc_jackAPIs are modified in recent kernel versions. This patch updates the codec driver to resolve the compilation errors related to jack framework.
Greg has already accepted this series so I won't review this now. But I still wanted to provide this comment.
It would be helpful in the future to provide a little more information about the nature of the changes to these APIs. As a reviewer I had to go track them down to get a little more context about what you are doing here. So you could say something like:
Audio jacks are now registered at the card level rather than being associated with a CODEC. The new card-based API allows a jack's pins to be supplied when the jack is first registered. See: 970939964c26 ("ASoC: Allow to register jacks at the card level")
In other words, don't just say "the APIs changed," say "here is how the APIs have changed." This kind of introduction can be very helpful and time saving for your reviewers.
-Alex
Quoted 138 lines
Signed-off-by Vaibhav Agarwal <[email protected]>Reviewed-by Dan Carpenter <[email protected]>--- drivers/staging/greybus/audio_codec.c | 54 +++++++++++++++++++++------ 1 file changed, 42 insertions(+), 12 deletions(-)drivers/staging/greybus/audio_codec.c +42
-12@@ -709,17 +709,26 @@ static struct snd_soc_dai_driver gbaudio_dai[] = { };static int gbaudio_init_jack (struct gbaudio_module_info *module, -struct snd_soc_codec *codec) +struct snd_soc_card *card) {int ret; +struct snd_soc_jack_pin *headset, *button;if (!module->jack_mask)return 0 ;snprintf (module->jack_name,NAME_SIZE ,"GB %d Headset Jack" , module->dev_id); - ret =snd_soc_jack_new (codec, module->jack_name, module->jack_mask, - &module->headset_jack); + + headset =devm_kzalloc (module->dev,sizeof (*headset),GFP_KERNEL ); +if (!headset) +return -ENOMEM ; + + headset->pin = module->jack_name; + headset->mask = module->jack_mask; + + ret =snd_soc_card_jack_new (card, module->jack_name, module->jack_mask, + &module->headset_jack, headset,1 );if (ret) {dev_err (module->dev,"Failed to create new jack\n" );return ret;@@ -730,11 +739,21 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module,snprintf (module->button_name,NAME_SIZE ,"GB %d Button Jack" , module->dev_id); - ret =snd_soc_jack_new (codec, module->button_name, module->button_mask, - &module->button_jack); + button =devm_kzalloc (module->dev,sizeof (*button),GFP_KERNEL ); +if (!button) { + ret = -ENOMEM ; + goto free_headset; + } + + button->pin = module->button_name; + button->mask = module->button_mask; + + ret =snd_soc_card_jack_new (card, module->button_name, + module->button_mask, &module->button_jack, + button,1 );if (ret) {dev_err (module->dev,"Failed to create button jack\n" ); -return ret; + goto free_headset; }/* @@ -750,7 +769,7 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module, KEY_MEDIA);if (ret) {dev_err (module->dev,"Failed to set BTN_0\n" ); -return ret; + goto free_button; } }@@ -759,7 +778,7 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module, KEY_VOICECOMMAND);if (ret) {dev_err (module->dev,"Failed to set BTN_1\n" ); -return ret; + goto free_button; } }@@ -768,7 +787,7 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module, KEY_VOLUMEUP);if (ret) {dev_err (module->dev,"Failed to set BTN_2\n" ); -return ret; + goto free_button; } }@@ -777,7 +796,7 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module, KEY_VOLUMEDOWN);if (ret) {dev_err (module->dev,"Failed to set BTN_0\n" ); -return ret; + goto free_button; } }@@ -788,6 +807,16 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module,*/ return 0 ; + +free_button: +snd_device_free (card->snd_card, module->button_jack.jack); +list_del (&module->button_jack.list); + +free_headset: +snd_device_free (card->snd_card, module->headset_jack.jack); +list_del (&module->headset_jack.list); + +return ret; }int gbaudio_register_module (struct gbaudio_module_info *module)@@ -815,7 +844,7 @@ int gbaudio_register_module(struct gbaudio_module_info *module)return -EINVAL ; } - ret =gbaudio_init_jack (module, codec); + ret =gbaudio_init_jack (module, component->card);if (ret) {up_write (&card->controls_rwsem);return ret;@@ -942,7 +971,8 @@ void gbaudio_unregister_module(struct gbaudio_module_info *module)#ifdef CONFIG_SND_JACK /* free jack devices for this module from codec->jack_list */ -list_for_each_entry_safe (jack, next_j, &codec->jack_list, list) { +list_for_each_entry_safe (jack, next_j, &component->card->jack_list, + list) {if (jack == &module->headset_jack) mask =GBCODEC_JACK_MASK ;else if (jack == &module->button_jack)
Vaibhav Agarwal
maintainerRe: [greybus-dev] [PATCH v4 1/7] staging: greybus: audio: Update snd_jack FW usage as per new APIs
Quoted 14 lines · Alex Elder
Quoted 3 lines · Vaibhav Agarwal
snd_soc_jackAPIs are modified in recent kernel versions. This patch updates the codec driver to resolve the compilation errors related to jack framework.Greg has already accepted this series so I won't review this now. But I still wanted to provide this comment.
It would be helpful in the future to provide a little more information about the nature of the changes to these APIs. As a reviewer I had to go track them down to get a little more context about what you are doing here. So you could say something like:
Quoted 9 lines
Audio jacks are now registered at the card level rather than being associated with a CODEC. The new card-based API allows a jack's pins to be supplied when the jack is first registered. See:
970939964c26("ASoC: Allow to register jacks at the card level")In other words, don't just say "the APIs changed," say "here is how the APIs have changed." This kind of introduction can be very helpful and time saving for your reviewers.
Thanks for the feedback Alex. I'll take care of the commit message while sharing similar patches.
--
vaibhav
Vaibhav Agarwal
maintainerPATCH v4 2/7 staging: greybus: audio: Maintain jack list within GB Audio module
In reply to Vaibhav AgarwalAs 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.
--- drivers/staging/greybus/audio_codec.c | 74 +++++++++++++------------- drivers/staging/greybus/audio_codec.h | 10 +++- drivers/staging/greybus/audio_module.c | 15 +++--- 3 files changed, 53 insertions(+), 46 deletions(-)
drivers/staging/greybus/audio_codec.c +37 -37
@@ -712,6 +712,7 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module, struct snd_soc_card *card) {int ret; +struct gbaudio_jack *jack, *n;struct snd_soc_jack_pin *headset, *button;if (!module->jack_mask)
@@ -726,14 +727,16 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module, headset->pin = module->jack_name; headset->mask = module->jack_mask; - ret =snd_soc_card_jack_new (card, module->jack_name, module->jack_mask, - &module->headset_jack, headset,1 ); + &module->headset.jack, headset,1 );if (ret) {dev_err (module->dev,"Failed to create new jack\n" );return ret; } +/* Add to module's jack list */ +list_add (&module->headset.list, &module->jack_list); +if (!module->button_mask)return 0 ;
@@ -742,20 +745,22 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module, button =devm_kzalloc (module->dev,sizeof (*button),GFP_KERNEL );if (!button) { ret = -ENOMEM ; - goto free_headset; + goto free_jacks; } button->pin = module->button_name; button->mask = module->button_mask; - ret =snd_soc_card_jack_new (card, module->button_name, - module->button_mask, &module->button_jack, + module->button_mask, &module->button.jack, button,1 );if (ret) {dev_err (module->dev,"Failed to create button jack\n" ); - goto free_headset; + goto free_jacks; } +/* Add to module's jack list */ +list_add (&module->button.list, &module->jack_list); +/* * Currently, max 4 buttons are supported with following key mapping * BTN_0 = KEY_MEDIA
@@ -765,56 +770,54 @@ 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 (module->button.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_jacks; } }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 (module->button.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_jacks; } }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 (module->button.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_jacks; } }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 (module->button.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_jacks; } }/* 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: -snd_device_free (card->snd_card, module->button_jack.jack); -list_del (&module->button_jack.list); - -free_headset: -snd_device_free (card->snd_card, module->headset_jack.jack); -list_del (&module->headset_jack.list); +free_jacks: +list_for_each_entry_safe (jack, n, &module->jack_list, list) { +snd_device_free (card->snd_card, jack->jack.jack); +list_del (&jack->list); + }return ret; }
@@ -824,7 +827,7 @@ int gbaudio_register_module(struct gbaudio_module_info *module)int ret;struct snd_soc_codec *codec;struct snd_card *card; -struct snd_soc_jack *jack =NULL ; +struct gbaudio_jack *jack =NULL ;if (!gbcodec) {dev_err (module->dev,"GB Codec not yet probed\n" );
@@ -869,11 +872,9 @@ 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 (jack, &module->jack_list, list) { +snd_device_register (codec->card->snd_card, + jack->jack.jack); }#endif }
@@ -957,7 +958,7 @@ 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 *jack, *n;int mask;dev_dbg (codec->dev,"Unregister %s module\n" , module->name);
@@ -970,20 +971,19 @@ 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 (jack, n, &module->jack_list, list) { +if (jack == &module->headset) mask =GBCODEC_JACK_MASK ; -else if (jack == &module->button_jack) +else if (jack == &module->button) mask =GBCODEC_JACK_BUTTON_MASK ;else mask =0 ;if (mask) {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); + jack->jack.jack->id); +snd_soc_jack_report (&jack->jack,0 , mask); +snd_device_free (codec->card->snd_card, jack->jack.jack);list_del (&jack->list); } }
drivers/staging/greybus/audio_codec.h +8 -2
@@ -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; };
drivers/staging/greybus/audio_module.c +8 -7
@@ -21,8 +21,8 @@ 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_jack *jack = module->headset.jack.jack; +struct snd_jack *btn_jack = module->button.jack.jack;if (!jack) { dev_err_ratelimited(module->dev,
@@ -38,11 +38,11 @@ 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 , +snd_soc_jack_report (&module->button.jack,0 , module->button_mask); module->button_status =0 ; } -snd_soc_jack_report (&module->headset_jack,0 , +snd_soc_jack_report (&module->headset.jack,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 (&module->headset.jack, report, module->jack_mask);return 0 ; }
@@ -70,7 +70,7 @@ 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_jack *btn_jack = module->button.jack.jack;if (!btn_jack) { dev_err_ratelimited(module->dev,
@@ -124,7 +124,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 (&module->button.jack, report, module->button_mask);return 0 ; }
@@ -258,6 +258,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));
Signature · 1 line
2.27.0
Vaibhav Agarwal
maintainerPATCH v4 3/7 staging: greybus: audio: Resolve compilation errors for GB codec module
In reply to Vaibhav AgarwalDue to dependencies on ASoC framework changes, GB dummy codec module compilation is currently disabled. This patch updates codec driver as per the latest ASoC APIs.
--- drivers/staging/greybus/audio_codec.c | 88 +++++++++++++-------------- drivers/staging/greybus/audio_codec.h | 2 +- 2 files changed, 44 insertions(+), 46 deletions(-)
drivers/staging/greybus/audio_codec.c +43 -45
@@ -825,7 +825,7 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module,int gbaudio_register_module (struct gbaudio_module_info *module) {int ret; -struct snd_soc_codec *codec; +struct snd_soc_component *comp;struct snd_card *card;struct gbaudio_jack *jack =NULL ;
@@ -834,8 +834,8 @@ int gbaudio_register_module(struct gbaudio_module_info *module)return -EAGAIN ; } - codec = gbcodec->codec; - card = codec->card->snd_card; + comp = gbcodec->component; + card = comp->card->snd_card;down_write (&card->controls_rwsem);
@@ -847,33 +847,33 @@ int gbaudio_register_module(struct gbaudio_module_info *module)return -EINVAL ; } - ret =gbaudio_init_jack (module, component->card); + ret =gbaudio_init_jack (module, comp->card);if (ret) {up_write (&card->controls_rwsem);return ret; }if (module->dapm_widgets) -snd_soc_dapm_new_controls (&codec->dapm, module->dapm_widgets, +snd_soc_dapm_new_controls (&comp->dapm, module->dapm_widgets, module->num_dapm_widgets);if (module->controls) -snd_soc_add_codec_controls (codec, module->controls, - module->num_controls); +snd_soc_add_component_controls (comp, module->controls, + module->num_controls);if (module->dapm_routes) -snd_soc_dapm_add_routes (&codec->dapm, module->dapm_routes, +snd_soc_dapm_add_routes (&comp->dapm, module->dapm_routes, module->num_dapm_routes);/* card already instantiated, create widgets here only */ -if (codec->card->instantiated) { -snd_soc_dapm_link_component_dai_widgets (codec->card, - &codec->dapm); +if (comp->card->instantiated) { +snd_soc_dapm_link_component_dai_widgets (comp->card, + &comp->dapm);#ifdef CONFIG_SND_JACK /* * register jack devices for this module * from codec->jack_list */ list_for_each_entry (jack, &module->jack_list, list) { -snd_device_register (codec->card->snd_card, +snd_device_register (comp->card->snd_card, jack->jack.jack); }#endif
@@ -883,9 +883,9 @@ int gbaudio_register_module(struct gbaudio_module_info *module)list_add (&module->list, &gbcodec->module_list);mutex_unlock (&gbcodec->lock); -if (codec->card->instantiated) - ret =snd_soc_dapm_new_widgets (&codec->dapm); -dev_dbg (codec->dev,"Registered %s module\n" , module->name); +if (comp->card->instantiated) + ret =snd_soc_dapm_new_widgets (comp->card); +dev_dbg (comp->dev,"Registered %s module\n" , module->name);up_write (&card->controls_rwsem);return ret;
@@ -956,18 +956,18 @@ static void gbaudio_codec_cleanup(struct gbaudio_module_info *module)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_component *comp = gbcodec->component; +struct snd_card *card = comp->card->snd_card;struct gbaudio_jack *jack, *n;int mask; -dev_dbg (codec->dev,"Unregister %s module\n" , module->name); +dev_dbg (comp->dev,"Unregister %s module\n" , module->name);down_write (&card->controls_rwsem);mutex_lock (&gbcodec->lock);gbaudio_codec_cleanup (module);list_del (&module->list); -dev_dbg (codec->dev,"Process Unregister %s module\n" , module->name); +dev_dbg (comp->dev,"Process Unregister %s module\n" , module->name);mutex_unlock (&gbcodec->lock);#ifdef CONFIG_SND_JACK
@@ -983,99 +983,97 @@ void gbaudio_unregister_module(struct gbaudio_module_info *module)dev_dbg (module->dev,"Report %s removal\n" , jack->jack.jack->id);snd_soc_jack_report (&jack->jack,0 , mask); -snd_device_free (codec->card->snd_card, jack->jack.jack); +snd_device_free (comp->card->snd_card, + jack->jack.jack); list_del(&jack->list); } }#endif if (module->dapm_routes) { -dev_dbg (codec->dev,"Removing %d routes\n" , +dev_dbg (comp->dev,"Removing %d routes\n" , module->num_dapm_routes); -snd_soc_dapm_del_routes (&codec->dapm, module->dapm_routes, +snd_soc_dapm_del_routes (&comp->dapm, module->dapm_routes, module->num_dapm_routes); }if (module->controls) { -dev_dbg (codec->dev,"Removing %d controls\n" , +dev_dbg (comp->dev,"Removing %d controls\n" , module->num_controls); -snd_soc_remove_codec_controls (codec, module->controls, +snd_soc_remove_codec_controls (comp, module->controls, module->num_controls); }if (module->dapm_widgets) { -dev_dbg (codec->dev,"Removing %d widgets\n" , +dev_dbg (comp->dev,"Removing %d widgets\n" , module->num_dapm_widgets); -snd_soc_dapm_free_controls (&codec->dapm, module->dapm_widgets, +snd_soc_dapm_free_controls (&comp->dapm, module->dapm_widgets, module->num_dapm_widgets); } -dev_dbg (codec->dev,"Unregistered %s module\n" , module->name); +dev_dbg (comp->dev,"Unregistered %s module\n" , module->name);up_write (&card->controls_rwsem); }EXPORT_SYMBOL (gbaudio_unregister_module);/* -* codec driver ops +* component driver ops */ -static int gbcodec_probe (struct snd_soc_codec *codec) +static int gbcodec_probe (struct snd_soc_component *comp) {int i;struct gbaudio_codec_info *info;struct gbaudio_codec_dai *dai; - info =devm_kzalloc (codec->dev,sizeof (*info),GFP_KERNEL ); + info =devm_kzalloc (comp->dev,sizeof (*info),GFP_KERNEL );if (!info)return -ENOMEM ; - info->dev = codec->dev; + info->dev = comp->dev;INIT_LIST_HEAD (&info->module_list);mutex_init (&info->lock);INIT_LIST_HEAD (&info->dai_list);/* init dai_list used to maintain runtime stream info */ for (i =0 ; i <ARRAY_SIZE (gbaudio_dai); i++) { - dai =devm_kzalloc (codec->dev,sizeof (*dai),GFP_KERNEL ); + dai =devm_kzalloc (comp->dev,sizeof (*dai),GFP_KERNEL );if (!dai)return -ENOMEM ; dai->id = gbaudio_dai[i].id;list_add (&dai->list, &info->dai_list); } - info->codec = codec; -snd_soc_codec_set_drvdata (codec, info); + info->component = comp; +snd_soc_component_set_drvdata (comp, info); gbcodec = info; -device_init_wakeup (codec->dev,1 ); +device_init_wakeup (comp->dev,1 );return 0 ; } -static int gbcodec_remove (struct snd_soc_codec *codec) +static void gbcodec_remove (struct snd_soc_component *comp) {/* Empty function for now */ -return 0 ; +return ; } -static int gbcodec_write (struct snd_soc_codec *codec,unsigned int reg, +static int gbcodec_write (struct snd_soc_component *comp,unsigned int reg,unsigned int value) {return 0 ; } -static unsigned int gbcodec_read (struct snd_soc_codec *codec, +static unsigned int gbcodec_read (struct snd_soc_component *comp,unsigned int reg) {return 0 ; } -static struct snd_soc_codec_driver soc_codec_dev_gbaudio = { +static const struct snd_soc_component_driver soc_codec_dev_gbaudio = { .probe = gbcodec_probe, .remove = gbcodec_remove, .read = gbcodec_read, .write = gbcodec_write, - - .idle_bias_off = true, - .ignore_pmdown_time =1 , };#ifdef CONFIG_PM
@@ -1099,13 +1097,13 @@ static const struct dev_pm_ops gbaudio_codec_pm_ops = {static int gbaudio_codec_probe (struct platform_device *pdev) { -return snd_soc_register_codec (&pdev->dev, &soc_codec_dev_gbaudio, +return devm_snd_soc_register_component (&pdev->dev, + &soc_codec_dev_gbaudio, gbaudio_dai,ARRAY_SIZE (gbaudio_dai)); }static int gbaudio_codec_remove (struct platform_device *pdev) { -snd_soc_unregister_codec (&pdev->dev);return 0 ; }
drivers/staging/greybus/audio_codec.h +1 -1
@@ -66,7 +66,7 @@ struct gbaudio_codec_dai {struct gbaudio_codec_info {struct device *dev; -struct snd_soc_codec *codec; +struct snd_soc_component *component;struct list_head module_list;/* to maintain runtime stream params for each DAI */ struct list_head dai_list;
Signature · 1 line
2.27.0
Vaibhav Agarwal
maintainerPATCH v4 4/7 staging: greybus: audio: Resolve compilation error in topology parser
In reply to Vaibhav AgarwalFix compilation errors for GB Audio topology parser code with recent kernel versions.
--- drivers/staging/greybus/audio_topology.c | 123 +++++++++++------------ 1 file changed, 57 insertions(+), 66 deletions(-)
drivers/staging/greybus/audio_topology.c +57 -66
@@ -5,8 +5,8 @@* Copyright 2015-2016 Linaro Ltd. */ +#include <linux/greybus.h> #include "audio_codec.h" -#include "greybus_protocols.h" #define GBAUDIO_INVALID_ID 0xFF
@@ -165,15 +165,15 @@ static int gbcodec_mixer_ctl_info(struct snd_kcontrol *kcontrol,struct gbaudio_ctl_pvt *data;struct gb_audio_ctl_elem_info *info;struct gbaudio_module_info *module; -struct snd_soc_codec *codec =snd_kcontrol_chip (kcontrol); -struct gbaudio_codec_info *gbcodec =snd_soc_codec_get_drvdata (codec); +struct snd_soc_component *comp =snd_soc_kcontrol_component (kcontrol); +struct gbaudio_codec_info *gbcodec =snd_soc_component_get_drvdata (comp); -dev_dbg (codec->dev,"Entered %s:%s\n" , __func__, kcontrol->id.name); +dev_dbg (comp->dev,"Entered %s:%s\n" , __func__, kcontrol->id.name); data = (struct gbaudio_ctl_pvt *)kcontrol->private_value; info = (struct gb_audio_ctl_elem_info *)data->info;if (!info) { -dev_err (codec->dev,"NULL info for %s\n" , uinfo->id.name); +dev_err (comp->dev,"NULL info for %s\n" , uinfo->id.name);return -EINVAL ; }
@@ -201,7 +201,7 @@ static int gbcodec_mixer_ctl_info(struct snd_kcontrol *kcontrol,strlcpy (uinfo->value.enumerated.name, name,NAME_SIZE );break ;default : -dev_err (codec->dev,"Invalid type: %d for %s:kcontrol\n" , +dev_err (comp->dev,"Invalid type: %d for %s:kcontrol\n" , info->type, kcontrol->id.name);break ; }
@@ -216,11 +216,11 @@ static int gbcodec_mixer_ctl_get(struct snd_kcontrol *kcontrol,struct gbaudio_ctl_pvt *data;struct gb_audio_ctl_elem_value gbvalue;struct gbaudio_module_info *module; -struct snd_soc_codec *codec =snd_kcontrol_chip (kcontrol); -struct gbaudio_codec_info *gb =snd_soc_codec_get_drvdata (codec); +struct snd_soc_component *comp =snd_soc_kcontrol_component (kcontrol); +struct gbaudio_codec_info *gb =snd_soc_component_get_drvdata (comp);struct gb_bundle *bundle; -dev_dbg (codec->dev,"Entered %s:%s\n" , __func__, kcontrol->id.name); +dev_dbg (comp->dev,"Entered %s:%s\n" , __func__, kcontrol->id.name); module =find_gb_module (gb, kcontrol->id.name);if (!module)return -EINVAL ;
@@ -239,7 +239,7 @@ static int gbcodec_mixer_ctl_get(struct snd_kcontrol *kcontrol,gb_pm_runtime_put_autosuspend (bundle);if (ret) { -dev_err_ratelimited (codec->dev,"%d:Error in %s for %s\n" , ret, +dev_err_ratelimited (comp->dev,"%d:Error in %s for %s\n" , ret, __func__, kcontrol->id.name);return ret; }
@@ -262,7 +262,7 @@ static int gbcodec_mixer_ctl_get(struct snd_kcontrol *kcontrol,le32_to_cpu (gbvalue.value.enumerated_item[1 ]);break ;default : -dev_err (codec->dev,"Invalid type: %d for %s:kcontrol\n" , +dev_err (comp->dev,"Invalid type: %d for %s:kcontrol\n" , info->type, kcontrol->id.name); ret = -EINVAL ;break ;
@@ -278,11 +278,11 @@ static int gbcodec_mixer_ctl_put(struct snd_kcontrol *kcontrol,struct gbaudio_ctl_pvt *data;struct gb_audio_ctl_elem_value gbvalue;struct gbaudio_module_info *module; -struct snd_soc_codec *codec =snd_kcontrol_chip (kcontrol); -struct gbaudio_codec_info *gb =snd_soc_codec_get_drvdata (codec); +struct snd_soc_component *comp =snd_soc_kcontrol_component (kcontrol); +struct gbaudio_codec_info *gb =snd_soc_component_get_drvdata (comp);struct gb_bundle *bundle; -dev_dbg (codec->dev,"Entered %s:%s\n" , __func__, kcontrol->id.name); +dev_dbg (comp->dev,"Entered %s:%s\n" , __func__, kcontrol->id.name); module =find_gb_module (gb, kcontrol->id.name);if (!module)return -EINVAL ;
@@ -309,7 +309,7 @@ static int gbcodec_mixer_ctl_put(struct snd_kcontrol *kcontrol,cpu_to_le32 (ucontrol->value.enumerated.item[1 ]);break ;default : -dev_err (codec->dev,"Invalid type: %d for %s:kcontrol\n" , +dev_err (comp->dev,"Invalid type: %d for %s:kcontrol\n" , info->type, kcontrol->id.name); ret = -EINVAL ;break ;
@@ -328,7 +328,7 @@ static int gbcodec_mixer_ctl_put(struct snd_kcontrol *kcontrol,gb_pm_runtime_put_autosuspend (bundle);if (ret) { -dev_err_ratelimited (codec->dev,"%d:Error in %s for %s\n" , ret, +dev_err_ratelimited (comp->dev,"%d:Error in %s for %s\n" , ret, __func__, kcontrol->id.name); }
@@ -352,11 +352,7 @@ static int gbcodec_mixer_dapm_ctl_info(struct snd_kcontrol *kcontrol,int platform_max, platform_min;struct gbaudio_ctl_pvt *data;struct gb_audio_ctl_elem_info *info; -struct snd_soc_dapm_widget_list *wlist =snd_kcontrol_chip (kcontrol); -struct snd_soc_dapm_widget *widget = wlist->widgets[0 ]; -struct snd_soc_codec *codec = widget->codec; -dev_dbg (codec->dev,"Entered %s:%s\n" , __func__, kcontrol->id.name); data = (struct gbaudio_ctl_pvt *)kcontrol->private_value; info = (struct gb_audio_ctl_elem_info *)data->info;
@@ -387,11 +383,11 @@ static int gbcodec_mixer_dapm_ctl_get(struct snd_kcontrol *kcontrol,struct gbaudio_module_info *module;struct snd_soc_dapm_widget_list *wlist =snd_kcontrol_chip (kcontrol);struct snd_soc_dapm_widget *widget = wlist->widgets[0 ]; -struct snd_soc_codec *codec = widget->codec; -struct gbaudio_codec_info *gb =snd_soc_codec_get_drvdata (codec); +struct device *codec_dev = widget->dapm->dev; +struct gbaudio_codec_info *gb =dev_get_drvdata (codec_dev);struct gb_bundle *bundle; -dev_dbg (codec->dev,"Entered %s:%s\n" , __func__, kcontrol->id.name); +dev_dbg (codec_dev,"Entered %s:%s\n" , __func__, kcontrol->id.name); module =find_gb_module (gb, kcontrol->id.name);if (!module)return -EINVAL ;
@@ -415,7 +411,7 @@ static int gbcodec_mixer_dapm_ctl_get(struct snd_kcontrol *kcontrol,gb_pm_runtime_put_autosuspend (bundle);if (ret) { -dev_err_ratelimited (codec->dev,"%d:Error in %s for %s\n" , ret, +dev_err_ratelimited (codec_dev,"%d:Error in %s for %s\n" , ret, __func__, kcontrol->id.name);return ret; }
@@ -437,11 +433,11 @@ static int gbcodec_mixer_dapm_ctl_put(struct snd_kcontrol *kcontrol,struct gbaudio_module_info *module;struct snd_soc_dapm_widget_list *wlist =snd_kcontrol_chip (kcontrol);struct snd_soc_dapm_widget *widget = wlist->widgets[0 ]; -struct snd_soc_codec *codec = widget->codec; -struct gbaudio_codec_info *gb =snd_soc_codec_get_drvdata (codec); +struct device *codec_dev = widget->dapm->dev; +struct gbaudio_codec_info *gb =dev_get_drvdata (codec_dev);struct gb_bundle *bundle; -dev_dbg (codec->dev,"Entered %s:%s\n" , __func__, kcontrol->id.name); +dev_dbg (codec_dev,"Entered %s:%s\n" , __func__, kcontrol->id.name); module =find_gb_module (gb, kcontrol->id.name);if (!module)return -EINVAL ;
@@ -464,11 +460,8 @@ static int gbcodec_mixer_dapm_ctl_put(struct snd_kcontrol *kcontrol,if (gbvalue.value.integer_value[0 ] != val) {for (wi =0 ; wi < wlist->num_widgets; wi++) { widget = wlist->widgets[wi]; - - widget->value = val; - widget->dapm->update =NULL ; -snd_soc_dapm_mixer_update_power (widget, kcontrol, - connect); +snd_soc_dapm_mixer_update_power (widget->dapm, kcontrol, + connect,NULL ); } gbvalue.value.integer_value[0 ] =cpu_to_le32 (ucontrol->value.integer.value[0 ]);
@@ -484,7 +477,7 @@ static int gbcodec_mixer_dapm_ctl_put(struct snd_kcontrol *kcontrol,gb_pm_runtime_put_autosuspend (bundle);if (ret) { -dev_err_ratelimited (codec->dev, +dev_err_ratelimited (codec_dev,"%d:Error in %s for %s\n" , ret, __func__, kcontrol->id.name);return ret;
@@ -553,11 +546,11 @@ static int gbcodec_enum_ctl_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) {int ret, ctl_id; -struct snd_soc_codec *codec =snd_kcontrol_chip (kcontrol); +struct snd_soc_component *comp =snd_soc_kcontrol_component (kcontrol); +struct gbaudio_codec_info *gb =snd_soc_component_get_drvdata (comp);struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;struct gb_audio_ctl_elem_value gbvalue;struct gbaudio_module_info *module; -struct gbaudio_codec_info *gb =snd_soc_codec_get_drvdata (codec);struct gb_bundle *bundle; module =find_gb_module (gb, kcontrol->id.name);
@@ -580,7 +573,7 @@ static int gbcodec_enum_ctl_get(struct snd_kcontrol *kcontrol,gb_pm_runtime_put_autosuspend (bundle);if (ret) { -dev_err_ratelimited (codec->dev,"%d:Error in %s for %s\n" , ret, +dev_err_ratelimited (comp->dev,"%d:Error in %s for %s\n" , ret, __func__, kcontrol->id.name);return ret; }
@@ -598,11 +591,11 @@ static int gbcodec_enum_ctl_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) {int ret, ctl_id; -struct snd_soc_codec *codec =snd_kcontrol_chip (kcontrol); +struct snd_soc_component *comp =snd_soc_kcontrol_component (kcontrol); +struct gbaudio_codec_info *gb =snd_soc_component_get_drvdata (comp);struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;struct gb_audio_ctl_elem_value gbvalue;struct gbaudio_module_info *module; -struct gbaudio_codec_info *gb =snd_soc_codec_get_drvdata (codec);struct gb_bundle *bundle; module =find_gb_module (gb, kcontrol->id.name);
@@ -613,13 +606,13 @@ static int gbcodec_enum_ctl_put(struct snd_kcontrol *kcontrol,if (ctl_id <0 )return -EINVAL ; -if (ucontrol->value.enumerated.item[0 ] > e->max -1 ) +if (ucontrol->value.enumerated.item[0 ] > e->items -1 )return -EINVAL ; gbvalue.value.enumerated_item[0 ] =cpu_to_le32 (ucontrol->value.enumerated.item[0 ]);if (e->shift_l != e->shift_r) { -if (ucontrol->value.enumerated.item[1 ] > e->max -1 ) +if (ucontrol->value.enumerated.item[1 ] > e->items -1 )return -EINVAL ; gbvalue.value.enumerated_item[1 ] =cpu_to_le32 (ucontrol->value.enumerated.item[1 ]);
@@ -637,8 +630,8 @@ static int gbcodec_enum_ctl_put(struct snd_kcontrol *kcontrol,gb_pm_runtime_put_autosuspend (bundle);if (ret) { -dev_err_ratelimited (codec->dev,"%d:Error in %s for %s\n" , ret, - __func__, kcontrol->id.name); +dev_err_ratelimited (comp->dev,"%d:Error in %s for %s\n" , + ret, __func__, kcontrol->id.name); }return ret;
@@ -659,13 +652,13 @@ static int gbaudio_tplg_create_enum_kctl(struct gbaudio_module_info *gb, gb_enum = &ctl->info.value.enumerated;/* since count=1, and reg is dummy */ - gbe->max =le32_to_cpu (gb_enum->items); + gbe->items =le32_to_cpu (gb_enum->items); gbe->texts =gb_generate_enum_strings (gb, gb_enum);/* debug enum info */ -dev_dbg (gb->dev,"Max:%d, name_length:%d\n" , gbe->max, +dev_dbg (gb->dev,"Max:%d, name_length:%d\n" , gbe->items,le16_to_cpu (gb_enum->names_length)); -for (i =0 ; i < gbe->max; i++) +for (i =0 ; i < gbe->items; i++)dev_dbg (gb->dev,"src[%d]: %s\n" , i, gbe->texts[i]); *kctl = (struct snd_kcontrol_new)
@@ -720,8 +713,8 @@ static int gbcodec_enum_dapm_ctl_get(struct snd_kcontrol *kcontrol,struct snd_soc_dapm_widget *widget = wlist->widgets[0 ];struct gbaudio_module_info *module;struct gb_audio_ctl_elem_value gbvalue; -struct snd_soc_codec *codec = widget->codec; -struct gbaudio_codec_info *gb =snd_soc_codec_get_drvdata (codec); +struct device *codec_dev = widget->dapm->dev; +struct gbaudio_codec_info *gb =dev_get_drvdata (codec_dev);struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;struct gb_bundle *bundle;
@@ -745,7 +738,7 @@ static int gbcodec_enum_dapm_ctl_get(struct snd_kcontrol *kcontrol,gb_pm_runtime_put_autosuspend (bundle);if (ret) { -dev_err_ratelimited (codec->dev,"%d:Error in %s for %s\n" , ret, +dev_err_ratelimited (codec_dev,"%d:Error in %s for %s\n" , ret, __func__, kcontrol->id.name);return ret; }
@@ -768,12 +761,12 @@ static int gbcodec_enum_dapm_ctl_put(struct snd_kcontrol *kcontrol,struct snd_soc_dapm_widget *widget = wlist->widgets[0 ];struct gb_audio_ctl_elem_value gbvalue;struct gbaudio_module_info *module; -struct snd_soc_codec *codec = widget->codec; -struct gbaudio_codec_info *gb =snd_soc_codec_get_drvdata (codec); +struct device *codec_dev = widget->dapm->dev; +struct gbaudio_codec_info *gb =dev_get_drvdata (codec_dev);struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;struct gb_bundle *bundle; -if (ucontrol->value.enumerated.item[0 ] > e->max -1 ) +if (ucontrol->value.enumerated.item[0 ] > e->items -1 )return -EINVAL ; module =find_gb_module (gb, kcontrol->id.name);
@@ -797,7 +790,7 @@ static int gbcodec_enum_dapm_ctl_put(struct snd_kcontrol *kcontrol,gb_pm_runtime_put_autosuspend (bundle);if (ret) { -dev_err_ratelimited (codec->dev,"%d:Error in %s for %s\n" , ret, +dev_err_ratelimited (codec_dev,"%d:Error in %s for %s\n" , ret, __func__, kcontrol->id.name);return ret; }
@@ -814,7 +807,7 @@ static int gbcodec_enum_dapm_ctl_put(struct snd_kcontrol *kcontrol, }if (e->shift_l != e->shift_r) { -if (ucontrol->value.enumerated.item[1 ] > e->max -1 ) +if (ucontrol->value.enumerated.item[1 ] > e->items -1 )return -EINVAL ; val |= ucontrol->value.enumerated.item[1 ] << e->shift_r; mask |= e->mask << e->shift_r;
@@ -837,16 +830,14 @@ static int gbcodec_enum_dapm_ctl_put(struct snd_kcontrol *kcontrol,gb_pm_runtime_put_autosuspend (bundle);if (ret) { -dev_err_ratelimited (codec->dev, +dev_err_ratelimited (codec_dev,"%d:Error in %s for %s\n" , ret, __func__, kcontrol->id.name); }for (wi =0 ; wi < wlist->num_widgets; wi++) { widget = wlist->widgets[wi]; - - widget->value = val; - widget->dapm->update =NULL ; -snd_soc_dapm_mux_update_power (widget, kcontrol, mux, e); +snd_soc_dapm_mux_update_power (widget->dapm, kcontrol, + val, e,NULL ); } }
@@ -868,13 +859,13 @@ static int gbaudio_tplg_create_enum_ctl(struct gbaudio_module_info *gb, gb_enum = &ctl->info.value.enumerated;/* since count=1, and reg is dummy */ - gbe->max =le32_to_cpu (gb_enum->items); + gbe->items =le32_to_cpu (gb_enum->items); gbe->texts =gb_generate_enum_strings (gb, gb_enum);/* debug enum info */ -dev_dbg (gb->dev,"Max:%d, name_length:%d\n" , gbe->max, +dev_dbg (gb->dev,"Max:%d, name_length:%d\n" , gbe->items,le16_to_cpu (gb_enum->names_length)); -for (i =0 ; i < gbe->max; i++) +for (i =0 ; i < gbe->items; i++)dev_dbg (gb->dev,"src[%d]: %s\n" , i, gbe->texts[i]); *kctl = (struct snd_kcontrol_new)
@@ -935,12 +926,12 @@ static int gbaudio_widget_event(struct snd_soc_dapm_widget *w, {int wid;int ret; -struct snd_soc_codec *codec = w->codec; -struct gbaudio_codec_info *gbcodec =snd_soc_codec_get_drvdata (codec); +struct device *codec_dev = w->dapm->dev; +struct gbaudio_codec_info *gbcodec =dev_get_drvdata (codec_dev);struct gbaudio_module_info *module;struct gb_bundle *bundle; -dev_dbg (codec->dev,"%s %s %d\n" , __func__, w->name, event); +dev_dbg (codec_dev,"%s %s %d\n" , __func__, w->name, event);/* Find relevant module */ module =find_gb_module (gbcodec, w->name);
@@ -950,7 +941,7 @@ static int gbaudio_widget_event(struct snd_soc_dapm_widget *w,/* map name to widget id */ wid =gbaudio_map_widgetname (module, w->name);if (wid <0 ) { -dev_err (codec->dev,"Invalid widget name:%s\n" , w->name); +dev_err (codec_dev,"Invalid widget name:%s\n" , w->name);return -EINVAL ; }
@@ -973,7 +964,7 @@ static int gbaudio_widget_event(struct snd_soc_dapm_widget *w,break ; }if (ret) -dev_err_ratelimited (codec->dev, +dev_err_ratelimited (codec_dev,"%d: widget, event:%d failed:%d\n" , wid, event, ret);
Signature · 1 line
2.27.0
Vaibhav Agarwal
maintainerPATCH v4 5/7 staging: greybus: audio: Add helper APIs for dynamic audio modules
In reply to Vaibhav AgarwalGreybus Codec driver allows modules to be dynamically added and removed, which further requires updating the DAPM configurations as well.
With current snd_soc architecture, dynamic audio modules is not yet supported. This patch provides helper APIs to update DAPM configurations in response to modules which are dynamically added or removed. The source is primarily based on snd_dapm.c
--- drivers/staging/greybus/Makefile | 2 +- drivers/staging/greybus/audio_codec.c | 12 +- drivers/staging/greybus/audio_helper.c | 197 +++++++++++++++++++++++++ drivers/staging/greybus/audio_helper.h | 17 +++ 4 files changed, 223 insertions(+), 5 deletions(-) create mode 100644 drivers/staging/greybus/audio_helper.c create mode 100644 drivers/staging/greybus/audio_helper.h
drivers/staging/greybus/Makefile +1 -1
@@ -28,7 +28,7 @@ obj-$(CONFIG_GREYBUS_VIBRATOR) += gb-vibrator.o # Greybus Audio is a bunch of modules gb-audio-module-y := audio_module.o audio_topology.o -gb-audio-codec-y := audio_codec.o +gb-audio-codec-y := audio_codec.o audio_helper.o gb-audio-gb-y := audio_gb.o gb-audio-apbridgea-y := audio_apbridgea.o gb-audio-manager-y := audio_manager.o audio_manager_module.o
drivers/staging/greybus/audio_codec.c +8 -4
@@ -14,6 +14,7 @@#include "audio_codec.h" #include "audio_apbridgea.h" #include "audio_manager.h" +#include "audio_helper.h" static struct gbaudio_codec_info *gbcodec;
@@ -865,7 +866,7 @@ int gbaudio_register_module(struct gbaudio_module_info *module)/* card already instantiated, create widgets here only */ if (comp->card->instantiated) { -snd_soc_dapm_link_component_dai_widgets (comp->card, +gbaudio_dapm_link_component_dai_widgets (comp->card, &comp->dapm);#ifdef CONFIG_SND_JACK /*
@@ -999,13 +1000,16 @@ void gbaudio_unregister_module(struct gbaudio_module_info *module)if (module->controls) {dev_dbg (comp->dev,"Removing %d controls\n" , module->num_controls); -snd_soc_remove_codec_controls (comp, module->controls, - module->num_controls); +/* release control semaphore */ +up_write (&card->controls_rwsem); +gbaudio_remove_component_controls (comp, module->controls, + module->num_controls); +down_write (&card->controls_rwsem); }if (module->dapm_widgets) {dev_dbg (comp->dev,"Removing %d widgets\n" , module->num_dapm_widgets); -snd_soc_dapm_free_controls (&comp->dapm, module->dapm_widgets, +gbaudio_dapm_free_controls (&comp->dapm, module->dapm_widgets, module->num_dapm_widgets); }
drivers/staging/greybus/audio_helper.c new file +197 -0
197 lines not on this page · raw message
drivers/staging/greybus/audio_helper.h new file +17 -0
@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Greybus Audio Sound SoC helper APIs +*/ + +#ifndef __LINUX_GBAUDIO_HELPER_H +#define __LINUX_GBAUDIO_HELPER_H + +int gbaudio_dapm_link_component_dai_widgets (struct snd_soc_card *card, +struct snd_soc_dapm_context *dapm); +int gbaudio_dapm_free_controls (struct snd_soc_dapm_context *dapm, +const struct snd_soc_dapm_widget *widget, +int num); +int gbaudio_remove_component_controls (struct snd_soc_component *component, +const struct snd_kcontrol_new *controls, +unsigned int num_controls); +#endif
Signature · 1 line
2.27.0
Vaibhav Agarwal
maintainerPATCH v4 6/7 staging: greybus: audio: Enable GB codec, audio module compilation.
In reply to Vaibhav AgarwalCurrently you can't enable the Gey Bus Audio Codec because there is no entry for it in the Kconfig file. Originally the config name was going to be AUDIO_MSM8994 but that's not correct because other types of hardware are supported now. I have chosen the name AUDIO_APB_CODEC instead. Also I had to update the dependencies for GREYBUS_AUDIO to make the compile work.
--- drivers/staging/greybus/Kconfig | 14 +++++++++++++- drivers/staging/greybus/Makefile | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-)
drivers/staging/greybus/Kconfig +13 -1
@@ -3,7 +3,7 @@ if GREYBUS config GREYBUS_AUDIO tristate "Greybus Audio Class driver" - depends on SOUND + depends on SOUND && SND_SOC help Select this option if you have a device that follows the Greybus Audio Class specification.
@@ -11,6 +11,18 @@ config GREYBUS_AUDIO To compile this code as a module, chose M here: the module will be called gb-audio.ko +config GREYBUS_AUDIO_APB_CODEC + tristate "Greybus APBridge Audio codec driver" + depends on SND_SOC && GREYBUS_AUDIO + help + Select this option if you have a Toshiba APB device that has I2S + ports and acts as a Greybus "Dummy codec". This device is a + bridge from an APB-I2S port to a Unipro network. + + To compile this code as a module, chose M here: the module + will be called gb-audio-codec.ko + + config GREYBUS_BOOTROM tristate "Greybus Bootrom Class driver" help
drivers/staging/greybus/Makefile +2 -2
@@ -40,8 +40,8 @@ gb-audio-manager-y := audio_manager.o audio_manager_module.o #ccflags-y += -DGB_AUDIO_MANAGER_SYSFS #endif -obj-$(CONFIG_GREYBUS_AUDIO_MSM8994) += gb-audio-codec.o -obj-$(CONFIG_GREYBUS_AUDIO_MSM8994) += gb-audio-module.o +obj-$(CONFIG_GREYBUS_AUDIO_APB_CODEC) += gb-audio-codec.o +obj-$(CONFIG_GREYBUS_AUDIO_APB_CODEC) += gb-audio-module.o obj-$(CONFIG_GREYBUS_AUDIO) += gb-audio-gb.o obj-$(CONFIG_GREYBUS_AUDIO) += gb-audio-apbridgea.o obj-$(CONFIG_GREYBUS_AUDIO) += gb-audio-manager.o
Signature · 1 line
2.27.0
Vaibhav Agarwal
maintainerPATCH v4 7/7 drivers: staging: audio: Fix the missing header file for helper file
In reply to Vaibhav AgarwalThis patch fixes the warning reported for missing prototypes due to missing header file. Also, it includes changes to remove unused_but_set_variables.
--- drivers/staging/greybus/audio_helper.c | 1 + drivers/staging/greybus/audio_topology.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-)
drivers/staging/greybus/audio_helper.c +1 -0
@@ -7,6 +7,7 @@#include <sound/core.h> #include <sound/soc.h> #include <sound/soc-dapm.h> +#include "audio_helper.h" #define gbaudio_dapm_for_each_direction (dir) \ for ((dir) = SND_SOC_DAPM_DIR_IN; (dir) <= SND_SOC_DAPM_DIR_OUT; \
drivers/staging/greybus/audio_topology.c +4 -4
@@ -28,14 +28,16 @@ static struct gbaudio_module_info *find_gb_module(struct gbaudio_codec_info *codec, char const *name) { - int dev_id, ret; + int dev_id;char begin[NAME_SIZE ];struct gbaudio_module_info *module;if (!name)return NULL ; - ret =sscanf (name,"%s %d" , begin, &dev_id); +if (sscanf (name,"%s %d" , begin, &dev_id) !=2 ) +return NULL ; +dev_dbg (codec->dev,"%s:Find module#%d\n" , __func__, dev_id);mutex_lock (&codec->lock);
@@ -377,7 +379,6 @@ static int gbcodec_mixer_dapm_ctl_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) {int ret; -struct gb_audio_ctl_elem_info *info;struct gbaudio_ctl_pvt *data;struct gb_audio_ctl_elem_value gbvalue;struct gbaudio_module_info *module;
@@ -393,7 +394,6 @@ static int gbcodec_mixer_dapm_ctl_get(struct snd_kcontrol *kcontrol,return -EINVAL ; data = (struct gbaudio_ctl_pvt *)kcontrol->private_value; - info = (struct gb_audio_ctl_elem_info *)data->info; bundle =to_gb_bundle (module->dev);if (data->vcount ==2 )
Signature · 1 line
2.27.0