ASoC: Support registering a DAI dynamically
Define API snd_soc_register_dai() to add a DAI dynamically and create the DAI widgets. Topology can use this API to register DAIs when probing a component with topology info. These DAIs's playback & capture widgets will be freed when the sound card is unregistered and the DAIs will be freed when cleaning up the component. And a dobj is embedded into the struct snd_soc_dai_driver. Topology can use the dobj to find the DAI drivers created by it and free them when the topology component is removed. Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
5e4fb37211
commit
68003e6cf2
|
@ -222,6 +222,7 @@ struct snd_soc_dai_driver {
|
|||
const char *name;
|
||||
unsigned int id;
|
||||
unsigned int base;
|
||||
struct snd_soc_dobj dobj;
|
||||
|
||||
/* DAI driver callbacks */
|
||||
int (*probe)(struct snd_soc_dai *dai);
|
||||
|
|
|
@ -1663,6 +1663,9 @@ int snd_soc_add_dai_link(struct snd_soc_card *card,
|
|||
void snd_soc_remove_dai_link(struct snd_soc_card *card,
|
||||
struct snd_soc_dai_link *dai_link);
|
||||
|
||||
int snd_soc_register_dai(struct snd_soc_component *component,
|
||||
struct snd_soc_dai_driver *dai_drv);
|
||||
|
||||
#include <sound/soc-dai.h>
|
||||
|
||||
#ifdef CONFIG_DEBUG_FS
|
||||
|
|
|
@ -2834,6 +2834,48 @@ err:
|
|||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* snd_soc_register_dai - Register a DAI dynamically & create its widgets
|
||||
*
|
||||
* @component: The component the DAIs are registered for
|
||||
* @dai_drv: DAI driver to use for the DAI
|
||||
*
|
||||
* Topology can use this API to register DAIs when probing a component.
|
||||
* These DAIs's widgets will be freed in the card cleanup and the DAIs
|
||||
* will be freed in the component cleanup.
|
||||
*/
|
||||
int snd_soc_register_dai(struct snd_soc_component *component,
|
||||
struct snd_soc_dai_driver *dai_drv)
|
||||
{
|
||||
struct snd_soc_dapm_context *dapm =
|
||||
snd_soc_component_get_dapm(component);
|
||||
struct snd_soc_dai *dai;
|
||||
int ret;
|
||||
|
||||
if (dai_drv->dobj.type != SND_SOC_DOBJ_PCM) {
|
||||
dev_err(component->dev, "Invalid dai type %d\n",
|
||||
dai_drv->dobj.type);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
lockdep_assert_held(&client_mutex);
|
||||
dai = soc_add_dai(component, dai_drv, false);
|
||||
if (!dai)
|
||||
return -ENOMEM;
|
||||
|
||||
/* Create the DAI widgets here. After adding DAIs, topology may
|
||||
* also add routes that need these widgets as source or sink.
|
||||
*/
|
||||
ret = snd_soc_dapm_new_dai_widgets(dapm, dai);
|
||||
if (ret != 0) {
|
||||
dev_err(component->dev,
|
||||
"Failed to create DAI widgets %d\n", ret);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(snd_soc_register_dai);
|
||||
|
||||
static void snd_soc_component_seq_notifier(struct snd_soc_dapm_context *dapm,
|
||||
enum snd_soc_dapm_type type, int subseq)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue