ASoC: implement DAI links in a list.
RFC PATCH 4/10 ASoC: implement DAI links in a list.
From: Mengdong Lin <[email protected]>
Implement a dai link list for the soc card.
And API snd_soc_add_dai_link() is defined for machine drivers to add DAI links dynamically based on topology.
Signed-off-by Mengdong Lin <[email protected]>
include/sound/soc.h +10 -2
@@ -1011,6 +1011,8 @@ struct snd_soc_dai_link {/* pmdown_time is ignored at stop */ unsigned int ignore_pmdown_time:1; + +struct list_head list;/* dai link list of the soc card */ };struct snd_soc_codec_conf {
@@ -1078,8 +1080,11 @@ struct snd_soc_card {long pmdown_time;/* CPU <--> Codec DAI links */ -struct snd_soc_dai_link *dai_link; -int num_links; +struct snd_soc_dai_link *dai_link;/* predefined links only */ +int num_links;/* predefined links only */ +struct list_head dai_link_list;/* all links except the dummy ones */ +int num_dai_links; +struct list_head rtd_list;int num_rtd;
@@ -1619,6 +1624,9 @@ int snd_soc_of_get_dai_link_codecs(struct device *dev,struct device_node *of_node, struct snd_soc_dai_link *dai_link); +void snd_soc_add_dai_link (struct snd_soc_card *card, +struct snd_soc_dai_link *dai_link); +#include <sound/soc-dai.h> #ifdef CONFIG_DEBUG_FS
sound/soc/soc-core.c +28 -0
@@ -1235,6 +1235,27 @@ static int soc_init_dai_link(struct snd_soc_card *card,return 0 ; } +/** +* snd_soc_add_dai_link - Add a DAI link dynamically +* @card: The ASoC card to which the DAI link is added +* @dai_link: The new DAI link to add +* +* This function adds a DAI link to the ASoC card, and creates a ASoC +* runtime for the link. +* +* Note: For adding DAI links dynamically by machine drivers based on +* the topology info when probing the platform component. And machine +* drivers can still define static DAI links in dai_link array. +*/ +void snd_soc_add_dai_link (struct snd_soc_card *card, +struct snd_soc_dai_link *dai_link) +{ +lockdep_assert_held (&client_mutex); +list_add_tail (&dai_link->list, &card->dai_link_list); + card->num_dai_links++; +} +EXPORT_SYMBOL_GPL (snd_soc_add_dai_link); +static void soc_set_name_prefix (struct snd_soc_card *card,struct snd_soc_component *component) {
@@ -1729,6 +1750,10 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) goto base_error; } +/* all predefined resources are ready, store non-dummy links */ +for (i =0 ; i < card->num_links; i++) +snd_soc_add_dai_link (card, card->dai_link+i); +/* initialize the register cache for each available codec */ list_for_each_entry (codec, &codec_list, list) {if (codec->cache_init)
@@ -2486,6 +2511,9 @@ int snd_soc_register_card(struct snd_soc_card *card)snd_soc_initialize_card_lists (card); +INIT_LIST_HEAD (&card->dai_link_list); + card->num_dai_links =0 ; +INIT_LIST_HEAD (&card->rtd_list); card->num_rtd =0 ;
Signature · 1 line
1.9.1