ASoC: audio-graph: Use of_node and DAI for DPCM DAI link names

For multiple instances of components, using DAI name alone for DAI links
is causing conflicts. Components can define multiple DAIs and hence using
just a device name won't help either. Thus DT device node reference and
DAI names are used to uniquely represent DAI link names.

Signed-off-by: Sameer Pujar <spujar@nvidia.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/1604329814-24779-4-git-send-email-spujar@nvidia.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index 97b4f5480a31cb94c6c39a2a7d6466744e7d017d..1e205629e89a24bab113c9d8cf5773f82be9182e 100644 (file)
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@ -253,7 +253,8 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,
                        goto out_put_node;
 
                ret = asoc_simple_set_dailink_name(dev, dai_link,
-                                                  "fe.%s",
+                                                  "fe.%pOFP.%s",
+                                                  cpus->of_node,
                                                   cpus->dai_name);
                if (ret < 0)
                        goto out_put_node;
@@ -287,7 +288,8 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,
                        goto out_put_node;
 
                ret = asoc_simple_set_dailink_name(dev, dai_link,
-                                                  "be.%s",
+                                                  "be.%pOFP.%s",
+                                                  codecs->of_node,
                                                   codecs->dai_name);
                if (ret < 0)
                        goto out_put_node;