From: Sameer Pujar <spujar-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
To: broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
perex-/Fr2/VpizcU@public.gmane.org,
tiwai-IBi9RG/b67k@public.gmane.org,
kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org,
robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Cc: thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org,
alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org,
linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
sharadg-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org,
mkumard-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org,
viswanathl-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org,
rlokhande-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org,
dramesh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org,
atalambedu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org,
nwartikar-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org,
swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org,
nicoleotsuka-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
Sameer Pujar <spujar-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
Subject: [PATCH 08/10] ASoC: audio-graph: Add support for component chaining
Date: Sun, 19 Jul 2020 10:40:15 +0530 [thread overview]
Message-ID: <1595135417-16589-9-git-send-email-spujar@nvidia.com> (raw)
In-Reply-To: <1595135417-16589-1-git-send-email-spujar-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
The audio-graph driver supports both normal and DPCM DAI links. The
sound cards requiring DPCM DAI link support, use DPCM_SELECTABLE flag
and DAI links are treated as DPCM links depending on the number of
child nodes in a given DAI link.
There is another requirement where multiple ASoC components need to
be connected together in a chained fashion in a component model. This
patch sets 'component_chaining' flag for such sound cards where FE<->BE
and multiple BE<->BE component connections are required. Hence support
for such sound cards is added under 'audio-graph-cc-card' compatible.
All DAI links under this are treated as DPCM links.
Signed-off-by: Sameer Pujar <spujar-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
sound/soc/generic/audio-graph-card.c | 32 +++++++++++++++++++++++++-------
1 file changed, 25 insertions(+), 7 deletions(-)
diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index 82d8c740..ccfcf5f 100644
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@ -20,10 +20,13 @@
#include <linux/string.h>
#include <sound/simple_card_utils.h>
-#define DPCM_SELECTABLE 1
-
#define PREFIX "audio-graph-card,"
+struct asoc_simple_soc_data {
+ unsigned int dpcm_selectable:1;
+ unsigned int component_chaining:1;
+};
+
static int graph_outdrv_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol,
int event)
@@ -449,7 +452,7 @@ static int graph_for_each_link(struct asoc_simple_priv *priv,
struct device_node *codec_ep;
struct device_node *codec_port;
struct asoc_simple_data adata;
- uintptr_t dpcm_selectable = (uintptr_t)of_device_get_match_data(dev);
+ const struct asoc_simple_soc_data *data = of_device_get_match_data(dev);
int rc, ret;
/* loop for all listed CPU port */
@@ -476,10 +479,12 @@ static int graph_for_each_link(struct asoc_simple_priv *priv,
* It is DPCM
* if Codec port has many endpoints,
* or has convert-xxx property
+ * or component chaining is used
*/
- if (dpcm_selectable &&
+ if (data && data->dpcm_selectable &&
((of_get_child_count(codec_port) > 1) ||
- adata.convert_rate || adata.convert_channels))
+ adata.convert_rate || adata.convert_channels ||
+ data->component_chaining))
ret = func_dpcm(priv, cpu_ep, codec_ep, li);
/* else normal sound */
else
@@ -650,6 +655,7 @@ static int graph_probe(struct platform_device *pdev)
{
struct asoc_simple_priv *priv;
struct device *dev = &pdev->dev;
+ const struct asoc_simple_soc_data *data = of_device_get_match_data(dev);
struct snd_soc_card *card;
struct link_info li;
int ret;
@@ -666,6 +672,9 @@ static int graph_probe(struct platform_device *pdev)
card->num_dapm_widgets = ARRAY_SIZE(graph_dapm_widgets);
card->probe = graph_card_probe;
+ if (data)
+ card->component_chaining = data->component_chaining;
+
memset(&li, 0, sizeof(li));
graph_get_dais_count(priv, &li);
if (!li.link || !li.dais)
@@ -711,10 +720,19 @@ static int graph_remove(struct platform_device *pdev)
return asoc_simple_clean_reference(card);
}
+static const struct asoc_simple_soc_data scu_card_data = {
+ .dpcm_selectable = 1,
+};
+
+static const struct asoc_simple_soc_data cc_card_data = {
+ .dpcm_selectable = 1,
+ .component_chaining = 1,
+};
+
static const struct of_device_id graph_of_match[] = {
{ .compatible = "audio-graph-card", },
- { .compatible = "audio-graph-scu-card",
- .data = (void *)DPCM_SELECTABLE },
+ { .compatible = "audio-graph-scu-card", .data = &scu_card_data, },
+ { .compatible = "audio-graph-cc-card", .data = &cc_card_data, },
{},
};
MODULE_DEVICE_TABLE(of, graph_of_match);
--
2.7.4
next prev parent reply other threads:[~2020-07-19 5:10 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-19 5:10 [PATCH 00/10] Audio graph card updates and usage with Tegra210 audio Sameer Pujar
2020-07-19 5:10 ` [PATCH 01/10] ASoC: soc-core: Fix component name_prefix parsing Sameer Pujar
[not found] ` <1595135417-16589-1-git-send-email-spujar-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2020-07-19 5:10 ` [PATCH 02/10] ASoC: audio-graph: Use of_node and DAI for DPCM DAI link names Sameer Pujar
2020-07-19 5:10 ` [PATCH 03/10] ASoC: audio-graph: Support Codec with multiple endpoints Sameer Pujar
[not found] ` <1595135417-16589-4-git-send-email-spujar-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2020-07-19 23:37 ` Kuninori Morimoto
[not found] ` <87365n2i2z.wl-kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
2020-07-20 4:14 ` Sameer Pujar
[not found] ` <870feaf2-3aa2-dbb8-f883-9b6cfcb36d82-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2020-07-20 5:13 ` Kuninori Morimoto
2020-08-03 12:02 ` Sameer Pujar
2020-07-19 5:10 ` [PATCH 04/10] ASoC: audio-graph: Support for empty end point Sameer Pujar
2020-07-19 5:10 ` [PATCH 05/10] ASoC: audio-graph: Identify 'no_pcm' DAI links for DPCM Sameer Pujar
2020-07-19 5:10 ` [PATCH 06/10] ASoC: soc-pcm: Get all BEs along DAPM path Sameer Pujar
2020-07-19 5:10 ` [PATCH 07/10] ASoC: dt-bindings: audio-graph-card: Support for component chaining Sameer Pujar
2020-07-19 5:10 ` Sameer Pujar [this message]
2020-07-19 5:10 ` [PATCH 09/10] arm64: tegra: Audio graph header for Tegra210 Sameer Pujar
[not found] ` <1595135417-16589-10-git-send-email-spujar-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2020-07-20 0:10 ` Kuninori Morimoto
[not found] ` <871rl72gjb.wl-kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
2020-07-20 4:17 ` Sameer Pujar
[not found] ` <b5484f5d-6ed4-e04b-3e62-8f4f3893ed67-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2020-07-20 4:51 ` Kuninori Morimoto
2020-08-03 12:06 ` Sameer Pujar
2020-07-19 5:10 ` [PATCH 10/10] arm64: tegra: Audio graph sound card for Jetson Nano and TX1 Sameer Pujar
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=1595135417-16589-9-git-send-email-spujar@nvidia.com \
--to=spujar-ddmlm1+adcrqt0dzr+alfa@public.gmane.org \
--cc=alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org \
--cc=atalambedu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \
--cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=dramesh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \
--cc=jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \
--cc=kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org \
--cc=lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=mkumard-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \
--cc=nicoleotsuka-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=nwartikar-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \
--cc=perex-/Fr2/VpizcU@public.gmane.org \
--cc=rlokhande-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \
--cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=sharadg-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \
--cc=swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \
--cc=thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=tiwai-IBi9RG/b67k@public.gmane.org \
--cc=viswanathl-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).