summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-01-16 12:42:57 +0000
committerMark Brown <broonie@linaro.org>2014-01-16 12:42:57 +0000
commit2f43a23ab9ea1865a663e100b0af20198decb4f1 (patch)
tree7501fb678115cbbdb544c43dc7b59f95408f1f52 /include/sound
parent7cfa7b547337faf5890c8c5f091e081fb79caf73 (diff)
parent55dcdb5051930dee75e9e2c0da90bc82ee3dcd77 (diff)
downloadop-kernel-dev-2f43a23ab9ea1865a663e100b0af20198decb4f1.zip
op-kernel-dev-2f43a23ab9ea1865a663e100b0af20198decb4f1.tar.gz
Merge remote-tracking branch 'asoc/topic/pcm' into for-tiwai
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/pcm.h2
-rw-r--r--include/sound/soc.h4
2 files changed, 6 insertions, 0 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index fe6ca40..4883499 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 5a049d9..03ce45b 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;
OpenPOWER on IntegriCloud