Merge branch 'asoc-5.7' into asoc-5.8

diff --cc include/sound/soc.h
Simple merge

diff --cc sound/soc/soc-dapm.c
index 8f26099,a4143ca..5c7b157
--- 1/sound/soc/soc-dapm.c
--- 2/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@@ -4432,7 -4410,18 +4410,18 @@@ void snd_soc_dapm_connect_dai_link_widg
                if (rtd->dai_link->dynamic)
                        continue;
  
-               dapm_connect_dai_link_widgets(card, rtd);
+               if (rtd->num_cpus == 1) {
+                       for_each_rtd_codec_dais(rtd, i, codec_dai)
+                               dapm_connect_dai_pair(card, rtd, codec_dai,
 -                                                    rtd->cpu_dais[0]);
++                                                    asoc_rtd_to_cpu(rtd, 0));
+               } else if (rtd->num_codecs == rtd->num_cpus) {
+                       for_each_rtd_codec_dais(rtd, i, codec_dai)
+                               dapm_connect_dai_pair(card, rtd, codec_dai,
 -                                                    rtd->cpu_dais[i]);
++                                                    asoc_rtd_to_cpu(rtd, i));
+               } else {
+                       dev_err(card->dev,
+                               "N cpus to M codecs link is not supported yet\n");
+               }
        }
  }