@@ -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;
@@ -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)
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(-)