[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1593233625-14961-10-git-send-email-spujar@nvidia.com>
Date: Sat, 27 Jun 2020 10:23:31 +0530
From: Sameer Pujar <spujar@...dia.com>
To: <broonie@...nel.org>, <perex@...ex.cz>, <tiwai@...e.com>,
<kuninori.morimoto.gx@...esas.com>, <robh+dt@...nel.org>,
<lgirdwood@...il.com>
CC: <thierry.reding@...il.com>, <jonathanh@...dia.com>,
<digetx@...il.com>, <alsa-devel@...a-project.org>,
<linux-tegra@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<sharadg@...dia.com>, <mkumard@...dia.com>,
<viswanathl@...dia.com>, <rlokhande@...dia.com>,
<dramesh@...dia.com>, <atalambedu@...dia.com>,
<nwartikar@...dia.com>, <swarren@...dia.com>,
<nicoleotsuka@...il.com>, Sameer Pujar <spujar@...dia.com>
Subject: [PATCH v4 09/23] ASoC: simple-card: Use of_node and DAI names for 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@...dia.com>
---
sound/soc/generic/simple-card.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 55e9f88..0f443c0 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -170,7 +170,8 @@ static int simple_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;
@@ -203,7 +204,8 @@ static int simple_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;
--
2.7.4
Powered by blists - more mailing lists