diff options
| author | Shengjiu Wang <shengjiu.wang@freescale.com> | 2017-06-14 17:35:20 +0800 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
| commit | e6c184ffdd50719568a45976d9e4f6eea21a40c4 (patch) | |
| tree | e123c23a6d72394d8e170b95899cf4c5e4e3f50f /include/sound | |
| parent | 0389db1314c4f49046e0023566a1721b4b4f4505 (diff) | |
MLK-15043-1: ASoC: soc-pcm: add dpcm_merged_chan in snd_soc_dai_link
According to commit b073ed4e2126 ("ASoC: soc-pcm: DPCM cares BE format"),
Current DPCM only care FE channel, but it will set unsupported channel to
drivers.
So add dpcm_merged_chan, which is used to merge the BE's codec
channels configuration to FE if it exist in snd_soc_dai_link. And
dpcm_runtime_base_chan function is to get the channel configuration of BE,
which likes the dpcm_runtime_base_format function.
Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
(cherry picked from commit 19ff1095d4b68d17a5f68a2de5654be72b606809)
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 4f1c784e44f6..7551854f2d16 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1052,6 +1052,7 @@ struct snd_soc_dai_link { /* DPCM used FE & BE merged format */ unsigned int dpcm_merged_format:1; + unsigned int dpcm_merged_chan:1; /* pmdown_time is ignored at stop */ unsigned int ignore_pmdown_time:1; |