Merge remote-tracking branch 'asoc/for-5.8' into asoc-linus

diff --cc include/sound/soc.h
index 53e2062b9cef0a9e0c4de42a219ee0a2e1942c8e,74868436ac79380f0dbc4715eb065cd80e1f493c..ef5dd28e10a9d9bdf4e721ea279ba23d6e8cef72
--- 1/include/sound/soc.h
--- 2/include/sound/soc.h
+++ b/include/sound/soc.h
@@@ -1143,19 -1148,18 +1145,21 @@@ struct snd_soc_pcm_runtime 
        /* runtime devices */
        struct snd_pcm *pcm;
        struct snd_compr *compr;
-       struct snd_soc_dai *codec_dai;
-       struct snd_soc_dai *cpu_dai;
-       struct snd_soc_dai **dais;
  
-       struct snd_soc_dai **codec_dais;
+       /*
+        * dais = cpu_dai + codec_dai
+        * see
+        *      soc_new_pcm_runtime()
+        *      asoc_rtd_to_cpu()
+        *      asoc_rtd_to_codec()
+        */
+       struct snd_soc_dai **dais;
        unsigned int num_codecs;
- 
-       struct snd_soc_dai **cpu_dais;
        unsigned int num_cpus;
  
 +      struct snd_soc_dapm_widget *playback_widget;
 +      struct snd_soc_dapm_widget *capture_widget;
 +
        struct delayed_work delayed_work;
        void (*close_delayed_work_func)(struct snd_soc_pcm_runtime *rtd);
  #ifdef CONFIG_DEBUG_FS

diff --cc sound/pci/hda/patch_hdmi.c
Simple merge

diff --cc sound/soc/codecs/max9867.c
Simple merge

diff --cc sound/soc/soc-dapm.c
Simple merge