From: Sameer Pujar <spujar@nvidia.com> To: <broonie@kernel.org>, <lgirdwood@gmail.com>, <robh+dt@kernel.org>, <kuninori.morimoto.gx@renesas.com>, <pierre-louis.bossart@linux.intel.com>, <perex@perex.cz>, <tiwai@suse.com>, <p.zabel@pengutronix.de>, <thierry.reding@gmail.com>, <jonathanh@nvidia.com> Cc: <alsa-devel@alsa-project.org>, <devicetree@vger.kernel.org>, <linux-tegra@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <sharadg@nvidia.com>, <mkumard@nvidia.com>, <viswanathl@nvidia.com>, <rlokhande@nvidia.com>, <dramesh@nvidia.com>, <atalambedu@nvidia.com>, <nwartikar@nvidia.com>, <swarren@nvidia.com>, <nicoleotsuka@gmail.com>, Sameer Pujar <spujar@nvidia.com> Subject: [PATCH v4 03/15] ASoC: audio-graph: Use of_node and DAI for DPCM DAI link names Date: Fri, 16 Oct 2020 20:12:50 +0530 [thread overview] Message-ID: <1602859382-19505-4-git-send-email-spujar@nvidia.com> (raw) In-Reply-To: <1602859382-19505-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>, <robh+dt@kernel.org>, <kuninori.morimoto.gx@renesas.com>, <pierre-louis.bossart@linux.intel.com>, <perex@perex.cz>, <tiwai@suse.com>, <p.zabel@pengutronix.de>, <thierry.reding@gmail.com>, <jonathanh@nvidia.com> Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, nicoleotsuka@gmail.com, swarren@nvidia.com, Sameer Pujar <spujar@nvidia.com>, linux-kernel@vger.kernel.org, atalambedu@nvidia.com, viswanathl@nvidia.com, sharadg@nvidia.com, nwartikar@nvidia.com, linux-tegra@vger.kernel.org, rlokhande@nvidia.com, mkumard@nvidia.com, dramesh@nvidia.com Subject: [PATCH v4 03/15] ASoC: audio-graph: Use of_node and DAI for DPCM DAI link names Date: Fri, 16 Oct 2020 20:12:50 +0530 [thread overview] Message-ID: <1602859382-19505-4-git-send-email-spujar@nvidia.com> (raw) In-Reply-To: <1602859382-19505-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
next prev parent reply other threads:[~2020-10-16 14:43 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-16 14:42 [PATCH v4 00/15] Audio graph card updates and usage with Tegra210 audio Sameer Pujar 2020-10-16 14:42 ` Sameer Pujar 2020-10-16 14:42 ` [PATCH v4 01/15] ASoC: soc-core: Fix component name_prefix parsing Sameer Pujar 2020-10-16 14:42 ` Sameer Pujar 2020-10-16 14:42 ` [PATCH v4 02/15] ASoC: soc-pcm: Get all BEs along DAPM path Sameer Pujar 2020-10-16 14:42 ` Sameer Pujar 2020-10-16 14:42 ` Sameer Pujar [this message] 2020-10-16 14:42 ` [PATCH v4 03/15] ASoC: audio-graph: Use of_node and DAI for DPCM DAI link names Sameer Pujar 2020-10-16 14:42 ` [PATCH v4 04/15] ASoC: audio-graph: Identify 'no_pcm' DAI links for DPCM Sameer Pujar 2020-10-16 14:42 ` Sameer Pujar 2020-10-16 14:42 ` [PATCH v4 05/15] ASoC: audio-graph: Support empty Codec endpoint Sameer Pujar 2020-10-16 14:42 ` Sameer Pujar 2020-10-16 14:42 ` [PATCH v4 06/15] ASoC: audio-graph: Expose new members for asoc_simple_priv Sameer Pujar 2020-10-16 14:42 ` Sameer Pujar 2020-10-16 14:42 ` [PATCH v4 07/15] ASoC: audio-graph: Expose helpers from audio graph Sameer Pujar 2020-10-16 14:42 ` Sameer Pujar 2020-10-16 14:42 ` [PATCH v4 08/15] Documentation: of: Convert graph bindings to json-schema Sameer Pujar 2020-10-16 14:42 ` Sameer Pujar 2020-10-19 21:56 ` Rob Herring 2020-10-19 21:56 ` Rob Herring 2020-10-20 5:34 ` Sameer Pujar 2020-10-20 5:34 ` Sameer Pujar 2020-10-20 8:30 ` Philipp Zabel 2020-10-20 8:30 ` Philipp Zabel 2020-10-23 13:45 ` Sameer Pujar 2020-10-23 13:45 ` Sameer Pujar 2020-10-16 14:42 ` [PATCH v4 09/15] ASoC: dt-bindings: audio-graph: Convert " Sameer Pujar 2020-10-16 14:42 ` Sameer Pujar 2020-10-19 2:50 ` Kuninori Morimoto 2020-10-19 2:50 ` Kuninori Morimoto 2020-10-19 4:30 ` Sameer Pujar 2020-10-19 4:30 ` Sameer Pujar 2020-10-19 4:41 ` Kuninori Morimoto 2020-10-19 4:41 ` Kuninori Morimoto 2020-10-19 22:11 ` Rob Herring 2020-10-19 22:11 ` Rob Herring 2020-10-16 14:42 ` [PATCH v4 10/15] ASoC: dt-bindings: tegra: Add graph bindings Sameer Pujar 2020-10-16 14:42 ` Sameer Pujar 2020-10-19 22:11 ` Rob Herring 2020-10-19 22:11 ` Rob Herring 2020-10-20 6:03 ` Sameer Pujar 2020-10-20 6:03 ` Sameer Pujar 2020-10-16 14:42 ` [PATCH v4 11/15] ASoC: dt-bindings: tegra: Add json-schema for Tegra audio graph card Sameer Pujar 2020-10-16 14:42 ` Sameer Pujar 2020-10-19 22:16 ` Rob Herring 2020-10-19 22:16 ` Rob Herring 2020-10-20 6:16 ` Sameer Pujar 2020-10-20 6:16 ` Sameer Pujar 2020-10-20 13:24 ` Rob Herring 2020-10-20 13:24 ` Rob Herring 2020-10-16 14:42 ` [PATCH v4 12/15] ASoC: tegra: Add audio graph based card driver Sameer Pujar 2020-10-16 14:42 ` Sameer Pujar 2020-10-16 14:43 ` [PATCH v4 13/15] arm64: defconfig: Enable Tegra audio graph " Sameer Pujar 2020-10-16 14:43 ` Sameer Pujar 2020-10-16 14:43 ` [PATCH v4 14/15] arm64: tegra: Audio graph header for Tegra210 Sameer Pujar 2020-10-16 14:43 ` Sameer Pujar 2020-10-16 14:43 ` [PATCH v4 15/15] arm64: tegra: Audio graph sound card for Jetson Nano and TX1 Sameer Pujar 2020-10-16 14:43 ` Sameer Pujar 2020-10-30 6:34 ` [PATCH v4 00/15] Audio graph card updates and usage with Tegra210 audio Sameer Pujar 2020-10-30 6:34 ` Sameer Pujar 2020-10-30 13:58 ` Mark Brown 2020-10-30 13:58 ` 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=1602859382-19505-4-git-send-email-spujar@nvidia.com \ --to=spujar@nvidia.com \ --cc=alsa-devel@alsa-project.org \ --cc=atalambedu@nvidia.com \ --cc=broonie@kernel.org \ --cc=devicetree@vger.kernel.org \ --cc=dramesh@nvidia.com \ --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=mkumard@nvidia.com \ --cc=nicoleotsuka@gmail.com \ --cc=nwartikar@nvidia.com \ --cc=p.zabel@pengutronix.de \ --cc=perex@perex.cz \ --cc=pierre-louis.bossart@linux.intel.com \ --cc=rlokhande@nvidia.com \ --cc=robh+dt@kernel.org \ --cc=sharadg@nvidia.com \ --cc=swarren@nvidia.com \ --cc=thierry.reding@gmail.com \ --cc=tiwai@suse.com \ --cc=viswanathl@nvidia.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: linkBe 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.