ASoC: Davinci: Fix race with cpu_dai->dma_data

[mirror_ubuntu-bionic-kernel.git] / sound / soc / davinci / davinci-mcasp.h

diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h
index 36b71047a06cbe88d2b35c984056f568dfd5322b..9d179cc88f7b84a9614753c0af34aef28a16c74d 100644 (file)
--- a/sound/soc/davinci/davinci-mcasp.h
+++ b/sound/soc/davinci/davinci-mcasp.h
@@ -39,10 +39,15 @@ enum {
 };
 
 struct davinci_audio_dev {
+       /*
+        * dma_params must be first because rtd->dai->cpu_dai->private_data
+        * is cast to a pointer of an array of struct davinci_pcm_dma_params in
+        * davinci_pcm_open.
+        */
+       struct davinci_pcm_dma_params dma_params[2];
        void __iomem *base;
        int sample_rate;
        struct clk *clk;
-       struct davinci_pcm_dma_params *dma_params[2];
        unsigned int codec_fmt;
 
        /* McASP specific data */
@@ -50,6 +55,11 @@ struct davinci_audio_dev {
        u8      op_mode;
        u8      num_serializer;
        u8      *serial_dir;
+       u8      version;
+
+       /* McASP FIFO related */
+       u8      txnumevt;
+       u8      rxnumevt;
 };
 
 #endif /* DAVINCI_MCASP_H */