From: Sameer Pujar <spujar@nvidia.com>
To: <broonie@kernel.org>, <perex@perex.cz>, <tiwai@suse.com>,
<kuninori.morimoto.gx@renesas.com>, <robh+dt@kernel.org>,
<lgirdwood@gmail.com>
Cc: <thierry.reding@gmail.com>, <jonathanh@nvidia.com>,
<digetx@gmail.com>, <alsa-devel@alsa-project.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 13/23] ASoC: simple-card: DPCM DAI link direction as per DAI capability
Date: Sat, 27 Jun 2020 10:23:35 +0530 [thread overview]
Message-ID: <1593233625-14961-14-git-send-email-spujar@nvidia.com> (raw)
In-Reply-To: <1593233625-14961-1-git-send-email-spujar@nvidia.com>
The soc_new_pcm() fails for DAI link having DAI which supports a
single stream direction of either PLAYBACK or CAPTURE. For example
it fails for Microphone which can support CAPTURE stream only. This
happens because simple-card driver by default populates both stream
directions.
This can be fixed by populating directions based on DAI capability.
For 'CPU<->Dummy' DAI links CPU is used to setup the direction and
similarly Codec is used for 'Dummy<->Codec' DAI links.
Signed-off-by: Sameer Pujar <spujar@nvidia.com>
---
sound/soc/generic/simple-card.c | 27 +++++++++++++++++++++++++--
sound/soc/soc-dai.c | 1 +
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 15c4388..62f2978 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -114,6 +114,23 @@ static void simple_parse_mclk_fs(struct device_node *top,
of_node_put(node);
}
+static int simple_parse_dpcm_dir(const struct snd_soc_dai_link_component *dlc,
+ struct snd_soc_dai_link *dai_link)
+{
+ struct snd_soc_dai *dai = snd_soc_find_dai(dlc);
+
+ if (!dai)
+ return -EINVAL;
+
+ dai_link->dpcm_playback =
+ snd_soc_dai_stream_valid(dai, SNDRV_PCM_STREAM_PLAYBACK);
+
+ dai_link->dpcm_capture =
+ snd_soc_dai_stream_valid(dai, SNDRV_PCM_STREAM_CAPTURE);
+
+ return 0;
+}
+
static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
struct device_node *np,
struct link_info *li,
@@ -183,6 +200,10 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
goto out_put_node;
asoc_simple_canonicalize_cpu(dai_link, is_single_links);
+
+ ret = simple_parse_dpcm_dir(cpus, dai_link);
+ if (ret < 0)
+ goto out_put_node;
} else {
struct snd_soc_codec_conf *cconf;
@@ -223,6 +244,10 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
"prefix");
snd_soc_of_parse_node_prefix(np, cconf, codecs->of_node,
"prefix");
+
+ ret = simple_parse_dpcm_dir(codecs, dai_link);
+ if (ret < 0)
+ goto out_put_node;
}
simple_parse_convert(dev, np, &dai_props->adata);
@@ -239,8 +264,6 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
if (ret < 0)
goto out_put_node;
- dai_link->dpcm_playback = 1;
- dai_link->dpcm_capture = 1;
dai_link->ops = &simple_ops;
dai_link->init = asoc_simple_dai_init;
diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c
index b05e18b..bd4465f 100644
--- a/sound/soc/soc-dai.c
+++ b/sound/soc/soc-dai.c
@@ -390,6 +390,7 @@ bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int dir)
/* If the codec specifies any channels at all, it supports the stream */
return stream->channels_min;
}
+EXPORT_SYMBOL_GPL(snd_soc_dai_stream_valid);
void snd_soc_dai_action(struct snd_soc_dai *dai,
int stream, int action)
--
2.7.4
next prev parent reply other threads:[~2020-06-27 4:55 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-27 4:53 [PATCH v4 00/23] Add support for Tegra210 Audio Sameer Pujar
2020-06-27 4:53 ` [PATCH v4 01/23] ASoC: dt-bindings: tegra: Add DT bindings for Tegra210 Sameer Pujar
2020-06-27 4:53 ` [PATCH v4 02/23] ASoC: tegra: Add support for CIF programming Sameer Pujar
2020-06-27 4:53 ` [PATCH v4 03/23] ASoC: tegra: Add Tegra210 based DMIC driver Sameer Pujar
2020-06-27 4:53 ` [PATCH v4 04/23] ASoC: tegra: Add Tegra210 based I2S driver Sameer Pujar
2020-06-27 4:53 ` [PATCH v4 05/23] ASoC: tegra: Add Tegra210 based AHUB driver Sameer Pujar
2020-06-27 4:53 ` [PATCH v4 06/23] ASoC: tegra: Add Tegra186 based DSPK driver Sameer Pujar
2020-06-27 4:53 ` [PATCH v4 07/23] ASoC: tegra: Add Tegra210 based ADMAIF driver Sameer Pujar
2020-06-27 4:53 ` [PATCH v4 08/23] ASoC: soc-core: Fix component name_prefix parsing Sameer Pujar
2020-06-29 0:38 ` Kuninori Morimoto
2020-06-29 15:46 ` Sameer Pujar
2020-06-30 10:45 ` Mark Brown
2020-06-30 12:56 ` Sameer Pujar
2020-06-27 4:53 ` [PATCH v4 09/23] ASoC: simple-card: Use of_node and DAI names for DAI link names Sameer Pujar
2020-06-27 4:53 ` [PATCH v4 10/23] ASoC: simple-card: Wrong daifmt for CPU end of DPCM DAI link Sameer Pujar
2020-06-29 0:56 ` Kuninori Morimoto
[not found] ` <6e27daa5-331e-968b-4027-2e30aeb7d382@nvidia.com>
2020-06-30 0:56 ` Kuninori Morimoto
2020-06-30 3:47 ` Sameer Pujar
2020-06-30 5:07 ` Kuninori Morimoto
2020-06-27 4:53 ` [PATCH v4 11/23] ASoC: simple-card: Loop over all children for 'mclk-fs' Sameer Pujar
2020-06-29 1:05 ` Kuninori Morimoto
2020-06-29 16:32 ` Sameer Pujar
2020-06-30 2:08 ` Kuninori Morimoto
2020-06-30 4:23 ` Sameer Pujar
2020-06-30 10:55 ` Mark Brown
2020-06-30 11:56 ` Sameer Pujar
2020-06-27 4:53 ` [PATCH v4 12/23] ASoC: simple-card: Support DPCM DAI link with multiple Codecs Sameer Pujar
2020-06-29 1:24 ` Kuninori Morimoto
2020-06-29 17:16 ` Sameer Pujar
2020-06-30 1:24 ` Kuninori Morimoto
2020-06-30 4:08 ` Sameer Pujar
2020-06-30 6:55 ` Kuninori Morimoto
2020-06-30 7:52 ` Sameer Pujar
2020-06-30 11:01 ` Mark Brown
2020-06-30 12:53 ` Sameer Pujar
2020-06-30 15:32 ` Mark Brown
2020-07-02 10:36 ` Sameer Pujar
2020-07-02 12:26 ` Mark Brown
2020-07-17 12:55 ` Sameer Pujar
2020-06-27 4:53 ` Sameer Pujar [this message]
2020-06-27 4:53 ` [PATCH v4 14/23] ASoC: soc-core: Probe auxiliary component before others Sameer Pujar
2020-06-27 4:53 ` [PATCH v4 15/23] ASoC: soc-core: Identify 'no_pcm' DAI links for DPCM Sameer Pujar
2020-06-29 1:38 ` Kuninori Morimoto
2020-06-29 17:19 ` Sameer Pujar
2020-06-30 6:07 ` Kuninori Morimoto
2020-06-30 8:03 ` Sameer Pujar
2020-07-02 0:52 ` Kuninori Morimoto
2020-07-02 3:48 ` Sameer Pujar
2020-07-02 8:50 ` Kuninori Morimoto
2020-07-02 9:56 ` Sameer Pujar
2020-06-27 4:53 ` [PATCH v4 16/23] ASoC: soc-pcm: Get all BEs along DAPM path Sameer Pujar
2020-06-29 1:41 ` Kuninori Morimoto
2020-06-29 17:29 ` Sameer Pujar
2020-06-27 4:53 ` [PATCH v4 17/23] ASoC: dt-bindings: simple-card: Add compatible for component chaining Sameer Pujar
2020-06-27 4:53 ` [PATCH v4 18/23] ASoC: simple-card: Add support " Sameer Pujar
2020-06-27 4:53 ` [PATCH v4 19/23] arm64: defconfig: Build AHUB component drivers Sameer Pujar
2020-06-27 4:53 ` [PATCH v4 20/23] arm64: defconfig: Enable CONFIG_TEGRA210_ADMA Sameer Pujar
2020-06-27 4:53 ` [PATCH v4 21/23] arm64: tegra: Add DT binding for AHUB components Sameer Pujar
2020-06-27 4:53 ` [PATCH v4 22/23] arm64: tegra: Enable AHUB components on few Tegra platforms Sameer Pujar
2020-06-27 4:53 ` [PATCH v4 23/23] arm64: tegra: Add support for APE sound card on Jetson Nano and TX1 Sameer Pujar
2020-06-30 10:51 ` [PATCH v4 00/23] Add support for Tegra210 Audio Mark Brown
2020-06-30 11:54 ` 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=1593233625-14961-14-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=digetx@gmail.com \
--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=perex@perex.cz \
--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: 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).