Commit 054d6500 authored by Jerome Brunet's avatar Jerome Brunet Committed by Mark Brown

ASoC: codec2codec: name link using stream direction

At the moment, codec to codec dai link widgets are named after the
cpu dai and the 1st codec valid on the link. This might be confusing
if there is multiple valid codecs on the link for one stream
direction.

Instead, use the dai link name and the stream direction to name the
the dai link widget
Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Link: https://lore.kernel.org/r/20190725165949.29699-3-jbrunet@baylibre.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 68c907f1
...@@ -4056,8 +4056,7 @@ snd_soc_dapm_alloc_kcontrol(struct snd_soc_card *card, ...@@ -4056,8 +4056,7 @@ snd_soc_dapm_alloc_kcontrol(struct snd_soc_card *card,
static struct snd_soc_dapm_widget * static struct snd_soc_dapm_widget *
snd_soc_dapm_new_dai(struct snd_soc_card *card, struct snd_soc_pcm_runtime *rtd, snd_soc_dapm_new_dai(struct snd_soc_card *card, struct snd_soc_pcm_runtime *rtd,
struct snd_soc_dapm_widget *source, char *id)
struct snd_soc_dapm_widget *sink)
{ {
struct snd_soc_dapm_widget template; struct snd_soc_dapm_widget template;
struct snd_soc_dapm_widget *w; struct snd_soc_dapm_widget *w;
...@@ -4067,7 +4066,7 @@ snd_soc_dapm_new_dai(struct snd_soc_card *card, struct snd_soc_pcm_runtime *rtd, ...@@ -4067,7 +4066,7 @@ snd_soc_dapm_new_dai(struct snd_soc_card *card, struct snd_soc_pcm_runtime *rtd,
int ret; int ret;
link_name = devm_kasprintf(card->dev, GFP_KERNEL, "%s-%s", link_name = devm_kasprintf(card->dev, GFP_KERNEL, "%s-%s",
source->name, sink->name); rtd->dai_link->name, id);
if (!link_name) if (!link_name)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
...@@ -4247,15 +4246,13 @@ static void dapm_connect_dai_link_widgets(struct snd_soc_card *card, ...@@ -4247,15 +4246,13 @@ static void dapm_connect_dai_link_widgets(struct snd_soc_card *card,
} }
for_each_rtd_codec_dai(rtd, i, codec_dai) { for_each_rtd_codec_dai(rtd, i, codec_dai) {
/* connect BE DAI playback if widgets are valid */ /* connect BE DAI playback if widgets are valid */
codec = codec_dai->playback_widget; codec = codec_dai->playback_widget;
if (playback_cpu && codec) { if (playback_cpu && codec) {
if (!playback) { if (!playback) {
playback = snd_soc_dapm_new_dai(card, rtd, playback = snd_soc_dapm_new_dai(card, rtd,
playback_cpu, "playback");
codec);
if (IS_ERR(playback)) { if (IS_ERR(playback)) {
dev_err(rtd->dev, dev_err(rtd->dev,
"ASoC: Failed to create DAI %s: %ld\n", "ASoC: Failed to create DAI %s: %ld\n",
...@@ -4284,8 +4281,7 @@ static void dapm_connect_dai_link_widgets(struct snd_soc_card *card, ...@@ -4284,8 +4281,7 @@ static void dapm_connect_dai_link_widgets(struct snd_soc_card *card,
if (codec && capture_cpu) { if (codec && capture_cpu) {
if (!capture) { if (!capture) {
capture = snd_soc_dapm_new_dai(card, rtd, capture = snd_soc_dapm_new_dai(card, rtd,
codec, "capture");
capture_cpu);
if (IS_ERR(capture)) { if (IS_ERR(capture)) {
dev_err(rtd->dev, dev_err(rtd->dev,
"ASoC: Failed to create DAI %s: %ld\n", "ASoC: Failed to create DAI %s: %ld\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment