[PATCHv4 1/9] ASoC: fsl-asoc-card: add support for dai links with multiple codecs

[Elinor Montmasson]

Add support for dai links using multiple codecs for multi-codec
use cases.

Signed-off-by: Elinor Montmasson <elinor.montmas...@savoirfairelinux.com>
Co-authored-by: Philip-Dylan Gleonec <philip-dylan.gleo...@savoirfairelinux.com>
---
 sound/soc/fsl/fsl-asoc-card.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
index 5ddc0c2fe53f..8a2a6e5461dc 100644
--- a/sound/soc/fsl/fsl-asoc-card.c
+++ b/sound/soc/fsl/fsl-asoc-card.c
@@ -815,10 +815,10 @@ static int fsl_asoc_card_probe(struct platform_device 
*pdev)
 
        /* Normal DAI Link */
        priv->dai_link[0].cpus->of_node = cpu_np;
-       priv->dai_link[0].codecs->dai_name = codec_dai_name;
+       priv->dai_link[0].codecs[0].dai_name = codec_dai_name;
 
        if (!fsl_asoc_card_is_ac97(priv))
-               priv->dai_link[0].codecs->of_node = codec_np;
+               priv->dai_link[0].codecs[0].of_node = codec_np;
        else {
                u32 idx;
 
@@ -829,11 +829,11 @@ static int fsl_asoc_card_probe(struct platform_device 
*pdev)
                        goto asrc_fail;
                }
 
-               priv->dai_link[0].codecs->name =
+               priv->dai_link[0].codecs[0].name =
                                devm_kasprintf(&pdev->dev, GFP_KERNEL,
                                               "ac97-codec.%u",
                                               (unsigned int)idx);
-               if (!priv->dai_link[0].codecs->name) {
+               if (!priv->dai_link[0].codecs[0].name) {
                        ret = -ENOMEM;
                        goto asrc_fail;
                }
@@ -844,13 +844,19 @@ static int fsl_asoc_card_probe(struct platform_device 
*pdev)
        priv->card.num_links = 1;
 
        if (asrc_pdev) {
+               int i;
+               struct snd_soc_dai_link_component *codec;
+               struct snd_soc_dai_link *link;
+
                /* DPCM DAI Links only if ASRC exists */
                priv->dai_link[1].cpus->of_node = asrc_np;
                priv->dai_link[1].platforms->of_node = asrc_np;
-               priv->dai_link[2].codecs->dai_name = codec_dai_name;
-               priv->dai_link[2].codecs->of_node = codec_np;
-               priv->dai_link[2].codecs->name =
-                               priv->dai_link[0].codecs->name;
+               link = &(priv->dai_link[2]);
+               for_each_link_codecs(link, i, codec) {
+                       codec->dai_name = priv->dai_link[0].codecs[i].dai_name;
+                       codec->of_node = priv->dai_link[0].codecs[i].of_node;
+                       codec->name = priv->dai_link[0].codecs[i].name;
+               }
                priv->dai_link[2].cpus->of_node = cpu_np;
                priv->dai_link[2].dai_fmt = priv->dai_fmt;
                priv->card.num_links = 3;
-- 
2.34.1