Merge remote-tracking branch 'asoc/topic/pcm' into for-tiwai

2 files changed, 6 insertions, 0 deletions

diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index fe6ca400b9ad..4883499ab38b 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -900,6 +900,8 @@ extern const struct snd_pcm_hw_constraint_list snd_pcm_known_rates;
 int snd_pcm_limit_hw_rates(struct snd_pcm_runtime *runtime);
 unsigned int snd_pcm_rate_to_rate_bit(unsigned int rate);
 unsigned int snd_pcm_rate_bit_to_rate(unsigned int rate_bit);
+unsigned int snd_pcm_rate_mask_intersect(unsigned int rates_a,
+                                         unsigned int rates_b);
 
 static inline void snd_pcm_set_runtime_buffer(struct snd_pcm_substream *substream,
                                               struct snd_dma_buffer *bufp)
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 5a049d969c59..03ce45bf8ade 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -895,6 +895,10 @@ struct snd_soc_dai_link {
         /* This DAI link can route to other DAI links at runtime (Frontend)*/
         unsigned int dynamic:1;
 
+        /* DPCM capture and Playback support */
+        unsigned int dpcm_capture:1;
+        unsigned int dpcm_playback:1;
+
         /* pmdown_time is ignored at stop */
         unsigned int ignore_pmdown_time:1;