From: Mark Brown <broonie@kernel.org>
Date: Fri, 9 Oct 2020 14:42:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/for-5.10' into asoc-next
X-Git-Tag: v5.15~2585^2~5^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c890e30b069a2792a5a34e8510a7a437dd6f5b3d;p=platform%2Fkernel%2Flinux-starfive.git

Merge remote-tracking branch 'asoc/for-5.10' into asoc-next
---

c890e30b069a2792a5a34e8510a7a437dd6f5b3d
diff --cc sound/soc/fsl/fsl_sai.h
index 677ecfc,ba7425a..4bbcd0d
--- a/sound/soc/fsl/fsl_sai.h
+++ b/sound/soc/fsl/fsl_sai.h
@@@ -180,9 -267,10 +267,11 @@@ struct fsl_sai 
  	unsigned int bclk_ratio;
  
  	const struct fsl_sai_soc_data *soc_data;
 +	struct snd_soc_dai_driver cpu_dai_drv;
  	struct snd_dmaengine_dai_dma_data dma_params_rx;
  	struct snd_dmaengine_dai_dma_data dma_params_tx;
+ 	struct fsl_sai_verid verid;
+ 	struct fsl_sai_param param;
  };
  
  #define TX 1