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: Jerome Brunet <jbrunet@baylibre.com>
Link: https://lore.kernel.org/r/20190725165949.29699-3-jbrunet@baylibre.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 034b31fd2ecb9b795e240b176789b424ded04589..7db4abd9a0a51c695eaf65fd878cafd5b9bdb69c 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -4056,8 +4056,7 @@ outfree_w_param:
 
 static struct snd_soc_dapm_widget *
 snd_soc_dapm_new_dai(struct snd_soc_card *card, struct snd_soc_pcm_runtime *rtd,
-                    struct snd_soc_dapm_widget *source,
-                    struct snd_soc_dapm_widget *sink)
+                    char *id)
 {
        struct snd_soc_dapm_widget template;
        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,
        int ret;
 
        link_name = devm_kasprintf(card->dev, GFP_KERNEL, "%s-%s",
-                                  source->name, sink->name);
+                                  rtd->dai_link->name, id);
        if (!link_name)
                return ERR_PTR(-ENOMEM);
 
@@ -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) {
-
                /* connect BE DAI playback if widgets are valid */
                codec = codec_dai->playback_widget;
 
                if (playback_cpu && codec) {
                        if (!playback) {
                                playback = snd_soc_dapm_new_dai(card, rtd,
-                                                               playback_cpu,
-                                                               codec);
+                                                               "playback");
                                if (IS_ERR(playback)) {
                                        dev_err(rtd->dev,
                                                "ASoC: Failed to create DAI %s: %ld\n",
@@ -4284,8 +4281,7 @@ static void dapm_connect_dai_link_widgets(struct snd_soc_card *card,
                if (codec && capture_cpu) {
                        if (!capture) {
                                capture = snd_soc_dapm_new_dai(card, rtd,
-                                                              codec,
-                                                              capture_cpu);
+                                                              "capture");
                                if (IS_ERR(capture)) {
                                        dev_err(rtd->dev,
                                                "ASoC: Failed to create DAI %s: %ld\n",