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 5/7] ASoC: audio-graph: Support empty Codec endpoint Date: Mon, 2 Nov 2020 20:40:12 +0530 [thread overview] Message-ID: <1604329814-24779-6-git-send-email-spujar@nvidia.com> (raw) In-Reply-To: <1604329814-24779-1-git-send-email-spujar@nvidia.com> For open platforms, which can support pluggable audio cards, Codec endpoint is not fixed always. It actually depends on the compatible HW module that is going to be connected. From SoC side the given I/O interface is always available. Hence such links have fixed CPU endpoint but no Codec endpoint. This patch helps to support such links where user can populate Codec endpoint only and its fields in Platform DT depending on the plugged HW. Signed-off-by: Sameer Pujar <spujar@nvidia.com> Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/generic/audio-graph-card.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index 9b06841..0ba50be9 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -229,6 +229,14 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, struct snd_soc_dai_link_component *codecs = dai_link->codecs; int ret; + /* + * Codec endpoint can be NULL for pluggable audio HW. + * Platform DT can populate the Codec endpoint depending on the + * plugged HW. + */ + if (!li->cpu && !codec_ep) + return 0; + /* Do it all CPU endpoint, and 1st Codec endpoint */ if (!li->cpu && dup_codec) return 0; @@ -565,7 +573,7 @@ static int graph_count_dpcm(struct asoc_simple_priv *priv, li->link++; /* 1xCPU-dummy */ li->dais++; /* 1xCPU */ - if (!dup_codec) { + if (!dup_codec && codec_ep) { li->link++; /* 1xdummy-Codec */ li->conf++; /* 1xdummy-Codec */ li->dais++; /* 1xCodec */ -- 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 5/7] ASoC: audio-graph: Support empty Codec endpoint Date: Mon, 2 Nov 2020 20:40:12 +0530 [thread overview] Message-ID: <1604329814-24779-6-git-send-email-spujar@nvidia.com> (raw) In-Reply-To: <1604329814-24779-1-git-send-email-spujar@nvidia.com> For open platforms, which can support pluggable audio cards, Codec endpoint is not fixed always. It actually depends on the compatible HW module that is going to be connected. From SoC side the given I/O interface is always available. Hence such links have fixed CPU endpoint but no Codec endpoint. This patch helps to support such links where user can populate Codec endpoint only and its fields in Platform DT depending on the plugged HW. Signed-off-by: Sameer Pujar <spujar@nvidia.com> Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/generic/audio-graph-card.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index 9b06841..0ba50be9 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -229,6 +229,14 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, struct snd_soc_dai_link_component *codecs = dai_link->codecs; int ret; + /* + * Codec endpoint can be NULL for pluggable audio HW. + * Platform DT can populate the Codec endpoint depending on the + * plugged HW. + */ + if (!li->cpu && !codec_ep) + return 0; + /* Do it all CPU endpoint, and 1st Codec endpoint */ if (!li->cpu && dup_codec) return 0; @@ -565,7 +573,7 @@ static int graph_count_dpcm(struct asoc_simple_priv *priv, li->link++; /* 1xCPU-dummy */ li->dais++; /* 1xCPU */ - if (!dup_codec) { + if (!dup_codec && codec_ep) { li->link++; /* 1xdummy-Codec */ li->conf++; /* 1xdummy-Codec */ li->dais++; /* 1xCodec */ -- 2.7.4
next prev 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 ` [PATCH v5 3/7] ASoC: audio-graph: Use of_node and DAI for DPCM DAI link names Sameer Pujar 2020-11-02 15:10 ` 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 ` Sameer Pujar [this message] 2020-11-02 15:10 ` [PATCH v5 5/7] ASoC: audio-graph: Support empty Codec endpoint 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-6-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: 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.