All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sameer Pujar <spujar@nvidia.com>
To: <broonie@kernel.org>, <lgirdwood@gmail.com>,
	<kuninori.morimoto.gx@renesas.com>,
	<pierre-louis.bossart@linux.intel.com>, <perex@perex.cz>,
	<tiwai@suse.com>
Cc: <thierry.reding@gmail.com>, <jonathanh@nvidia.com>,
	<alsa-devel@alsa-project.org>, <linux-tegra@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>, <sharadg@nvidia.com>,
	Sameer Pujar <spujar@nvidia.com>
Subject: [PATCH v5 3/7] ASoC: audio-graph: Use of_node and DAI for DPCM DAI link names
Date: Mon, 2 Nov 2020 20:40:10 +0530	[thread overview]
Message-ID: <1604329814-24779-4-git-send-email-spujar@nvidia.com> (raw)
In-Reply-To: <1604329814-24779-1-git-send-email-spujar@nvidia.com>

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>
---
 sound/soc/generic/audio-graph-card.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index 97b4f54..1e20562 100644
--- 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;
-- 
2.7.4


WARNING: multiple messages have this Message-ID (diff)
From: Sameer Pujar <spujar@nvidia.com>
To: <broonie@kernel.org>, <lgirdwood@gmail.com>,
	<kuninori.morimoto.gx@renesas.com>,
	<pierre-louis.bossart@linux.intel.com>, <perex@perex.cz>,
	<tiwai@suse.com>
Cc: alsa-devel@alsa-project.org, Sameer Pujar <spujar@nvidia.com>,
	linux-kernel@vger.kernel.org, jonathanh@nvidia.com,
	sharadg@nvidia.com, thierry.reding@gmail.com,
	linux-tegra@vger.kernel.org
Subject: [PATCH v5 3/7] ASoC: audio-graph: Use of_node and DAI for DPCM DAI link names
Date: Mon, 2 Nov 2020 20:40:10 +0530	[thread overview]
Message-ID: <1604329814-24779-4-git-send-email-spujar@nvidia.com> (raw)
In-Reply-To: <1604329814-24779-1-git-send-email-spujar@nvidia.com>

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>
---
 sound/soc/generic/audio-graph-card.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index 97b4f54..1e20562 100644
--- 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;
-- 
2.7.4


  parent reply	other threads:[~2020-11-02 15:11 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-02 15:10 [PATCH v5 0/7] Audio Graph Updates Sameer Pujar
2020-11-02 15:10 ` Sameer Pujar
2020-11-02 15:10 ` [PATCH v5 1/7] ASoC: soc-core: Fix component name_prefix parsing Sameer Pujar
2020-11-02 15:10   ` Sameer Pujar
2020-11-02 15:10 ` [PATCH v5 2/7] ASoC: soc-pcm: Get all BEs along DAPM path Sameer Pujar
2020-11-02 15:10   ` Sameer Pujar
2020-11-02 15:10 ` Sameer Pujar [this message]
2020-11-02 15:10   ` [PATCH v5 3/7] ASoC: audio-graph: Use of_node and DAI for DPCM DAI link names Sameer Pujar
2020-11-02 15:10 ` [PATCH v5 4/7] ASoC: audio-graph: Identify 'no_pcm' DAI links for DPCM Sameer Pujar
2020-11-02 15:10   ` Sameer Pujar
2020-11-02 15:10 ` [PATCH v5 5/7] ASoC: audio-graph: Support empty Codec endpoint Sameer Pujar
2020-11-02 15:10   ` Sameer Pujar
2020-11-02 15:10 ` [PATCH v5 6/7] ASoC: audio-graph: Expose new members for asoc_simple_priv Sameer Pujar
2020-11-02 15:10   ` Sameer Pujar
2020-11-02 15:10 ` [PATCH v5 7/7] ASoC: audio-graph: Expose helpers from audio graph Sameer Pujar
2020-11-02 15:10   ` Sameer Pujar
2020-11-09 20:30 ` [PATCH v5 0/7] Audio Graph Updates Mark Brown
2020-11-09 20:30   ` Mark Brown
2020-11-09 23:19   ` Kuninori Morimoto
2020-11-09 23:19     ` Kuninori Morimoto
2020-11-10 21:38 ` Mark Brown
2020-11-10 21:38   ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1604329814-24779-4-git-send-email-spujar@nvidia.com \
    --to=spujar@nvidia.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=jonathanh@nvidia.com \
    --cc=kuninori.morimoto.gx@renesas.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=perex@perex.cz \
    --cc=pierre-louis.bossart@linux.intel.com \
    --cc=sharadg@nvidia.com \
    --cc=thierry.reding@gmail.com \
    --cc=tiwai@suse.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.