summaryrefslogtreecommitdiffstats
path: root/include/sound/soc.h
diff options
context:
space:
mode:
authorJerome Brunet <jbrunet@baylibre.com>2018-07-05 12:13:49 +0200
committerMark Brown <broonie@kernel.org>2018-07-11 11:58:41 +0100
commitbaacd8d100d571aa713c3c60b1471b9962e6ec8a (patch)
tree6c085dd5f4cfb219f3a2b177630b528300c4f2ff /include/sound/soc.h
parent435ffb76f8b35be108a52bf1c43233a57b3c72b4 (diff)
downloadlinux-baacd8d100d571aa713c3c60b1471b9962e6ec8a.tar.gz
linux-baacd8d100d571aa713c3c60b1471b9962e6ec8a.tar.bz2
linux-baacd8d100d571aa713c3c60b1471b9962e6ec8a.zip
ASoC: dpcm: add rate merge to the BE stream merge
As done for format and channels, add the possibility to merge the backend rates on the frontend rates. This useful if the backend does not support all rates supported by the frontend, or if several backends (cpu and codecs) with different capabilities are connected to the same frontend. Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/sound/soc.h')
-rw-r--r--include/sound/soc.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 870ba6b64817..a4915148f739 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -964,6 +964,8 @@ struct snd_soc_dai_link {
unsigned int dpcm_merged_format:1;
/* DPCM used FE & BE merged channel */
unsigned int dpcm_merged_chan:1;
+ /* DPCM used FE & BE merged rate */
+ unsigned int dpcm_merged_rate:1;
/* pmdown_time is ignored at stop */
unsigned int ignore_pmdown_time:1;