Current rsrc-card is assuming 1 FE (= CPU), 1 BE (= codec) on card.
But, it will support multi FE/BE card. This is prepare for it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Keita Kobayashi <keita.kobayashi.ym@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-#define RSRC_FB_NUM 2 /* FE/BE */
#define IDX_CPU 0
#define IDX_CODEC 1
#define DAI_NAME_NUM 32
#define IDX_CPU 0
#define IDX_CODEC 1
#define DAI_NAME_NUM 32
struct rsrc_card_dai cpu_dai;
struct rsrc_card_dai codec_dai;
char dai_name[DAI_NAME_NUM];
struct rsrc_card_dai cpu_dai;
struct rsrc_card_dai codec_dai;
char dai_name[DAI_NAME_NUM];
- } dai_props[RSRC_FB_NUM];
struct snd_soc_codec_conf codec_conf;
struct snd_soc_codec_conf codec_conf;
- struct snd_soc_dai_link dai_link[RSRC_FB_NUM];
+ struct snd_soc_dai_link *dai_link;
+ int dai_num;
struct device *dev)
{
const struct rsrc_card_of_data *of_data = rsrc_dev_to_of_data(dev);
struct device *dev)
{
const struct rsrc_card_of_data *of_data = rsrc_dev_to_of_data(dev);
+ struct rsrc_card_dai_props *props;
+ struct snd_soc_dai_link *links;
+
if (!node)
return -EINVAL;
if (!node)
return -EINVAL;
+ num = of_get_child_count(node);
+ props = devm_kzalloc(dev, sizeof(*props) * num, GFP_KERNEL);
+ links = devm_kzalloc(dev, sizeof(*links) * num, GFP_KERNEL);
+ if (!props || !links)
+ return -ENOMEM;
+
+ priv->dai_props = props;
+ priv->dai_link = links;
+ priv->dai_num = num;
+
/* Parse the card name from DT */
snd_soc_of_parse_card_name(&priv->snd_card, "card-name");
/* Parse the card name from DT */
snd_soc_of_parse_card_name(&priv->snd_card, "card-name");
priv->snd_card.owner = THIS_MODULE;
priv->snd_card.dev = dev;
priv->snd_card.dai_link = priv->dai_link;
priv->snd_card.owner = THIS_MODULE;
priv->snd_card.dev = dev;
priv->snd_card.dai_link = priv->dai_link;
- priv->snd_card.num_links = RSRC_FB_NUM;
+ priv->snd_card.num_links = num;
priv->snd_card.codec_conf = &priv->codec_conf;
priv->snd_card.num_configs = 1;
priv->snd_card.of_dapm_routes = of_data->routes;
priv->snd_card.codec_conf = &priv->codec_conf;
priv->snd_card.num_configs = 1;
priv->snd_card.of_dapm_routes = of_data->routes;
priv->convert_rate);
/* FE/BE */
priv->convert_rate);
/* FE/BE */
- for (i = 0; i < RSRC_FB_NUM; i++) {
+ for (i = 0; i < num; i++) {
ret = rsrc_card_dai_link_of(node, priv, i);
if (ret < 0)
return ret;
ret = rsrc_card_dai_link_of(node, priv, i);
if (ret < 0)
return ret;