From: Mark Brown <broonie@kernel.org>
Date: Mon, 1 Jun 2020 12:01:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/for-5.8' into asoc-linus
X-Git-Tag: v5.15~2585^2~143^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=358c7c61fd04d324f83d7968daf8dd9a6ff86a9a;p=platform%2Fkernel%2Flinux-starfive.git

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

358c7c61fd04d324f83d7968daf8dd9a6ff86a9a
diff --cc include/sound/soc.h
index 53e2062,7486843..ef5dd28
--- a/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