Merge remote-tracking branch 'asoc/topic/dma' into asoc-next

diff --combined include/sound/soc-dai.h
index d8acf0c,97943fd..b0ee659
--- 1/include/sound/soc-dai.h
--- 2/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@@ -105,8 -105,6 +105,8 @@@ int snd_soc_dai_set_clkdiv(struct snd_s
  int snd_soc_dai_set_pll(struct snd_soc_dai *dai,
        int pll_id, int source, unsigned int freq_in, unsigned int freq_out);
  
 +int snd_soc_dai_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio);
 +
  /* Digital Audio interface formatting */
  int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt);
  
@@@ -133,7 -131,6 +133,7 @@@ struct snd_soc_dai_ops 
        int (*set_pll)(struct snd_soc_dai *dai, int pll_id, int source,
                unsigned int freq_in, unsigned int freq_out);
        int (*set_clkdiv)(struct snd_soc_dai *dai, int div_id, int div);
 +      int (*set_bclk_ratio)(struct snd_soc_dai *dai, unsigned int ratio);
  
        /*
         * DAI format configuration
@@@ -279,6 -276,13 +279,13 @@@ static inline void snd_soc_dai_set_dma_
                dai->capture_dma_data = data;
  }
  
+ static inline void snd_soc_dai_init_dma_data(struct snd_soc_dai *dai,
+                                            void *playback, void *capture)
+ {
+       dai->playback_dma_data = playback;
+       dai->capture_dma_data = capture;
+ }
+ 
  static inline void snd_soc_dai_set_drvdata(struct snd_soc_dai *dai,
                void *data)
  {