summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-01-16 16:59:04 +0000
committerMark Brown <broonie@kernel.org>2015-01-16 16:59:04 +0000
commit5d6bdfd56849b0db094006d7aa118746c899fa01 (patch)
tree53db5478e157a7d2c3e91691d562a443be839f79 /include
parent074b89bb5fb7e80e0f98f1b45f276b0386269e3d (diff)
parentddaca25aa4dade234163290f6a9e091e7f57b36a (diff)
downloadcachepc-linux-5d6bdfd56849b0db094006d7aa118746c899fa01.tar.gz
cachepc-linux-5d6bdfd56849b0db094006d7aa118746c899fa01.zip
Merge branch 'topic/dai' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-samsung
Diffstat (limited to 'include')
-rw-r--r--include/sound/soc.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index b4fca9aed2a2..edd4a0a11ccf 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -429,6 +429,9 @@ bool snd_soc_runtime_ignore_pmdown_time(struct snd_soc_pcm_runtime *rtd);
void snd_soc_runtime_activate(struct snd_soc_pcm_runtime *rtd, int stream);
void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream);
+int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
+ unsigned int dai_fmt);
+
/* Utility functions to get clock rates from various things */
int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots);
int snd_soc_params_to_frame_size(struct snd_pcm_hw_params *params);