summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorJiada Wang <jiada_wang@mentor.com>2018-06-20 11:25:20 +0200
committerMark Brown <broonie@kernel.org>2018-06-22 16:57:03 +0200
commitf4c277b817cc9489fffabffb4e15d2f3b686056c (patch)
tree97aab96d4ff6ec3a8b598dd47130d5685b23783c /include/sound
parentASoC: add hp-det-gpio and mic-det-gpio to audio graph card binding (diff)
downloadlinux-f4c277b817cc9489fffabffb4e15d2f3b686056c.tar.xz
linux-f4c277b817cc9489fffabffb4e15d2f3b686056c.zip
ASoC: soc-pcm: DPCM cares BE channel constraint
Current DPCM is caring only FE channel configuration. Sometimes it will be trouble if user selects channel which isn't supported by BE. This patch adds new .dpcm_merged_chan on struct snd_soc_dai_link. DPCM will use FE / BE merged channel if struct snd_soc_dai_link has it. Signed-off-by: Jiada Wang <jiada_wang@mentor.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/sound')
-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 1378dcd2128a..f7579f82cc00 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -957,6 +957,8 @@ struct snd_soc_dai_link {
/* DPCM used FE & BE merged format */
unsigned int dpcm_merged_format:1;
+ /* DPCM used FE & BE merged channel */
+ unsigned int dpcm_merged_chan:1;
/* pmdown_time is ignored at stop */
unsigned int ignore_pmdown_time:1;