summaryrefslogtreecommitdiff
path: root/sound/soc/fsl/imx-cs42888.c
diff options
context:
space:
mode:
authorShengjiu Wang <shengjiu.wang@freescale.com>2017-06-14 17:40:17 +0800
committerDong Aisheng <aisheng.dong@nxp.com>2019-11-25 15:50:09 +0800
commit27496f3b2dde6f0bd4b964d54bfb438e0fdef597 (patch)
treee6782e0e7d4dbcd632dc943e50aed3e9d502cd00 /sound/soc/fsl/imx-cs42888.c
parent1c3a98e0fcf19d9da94e7a0a98814628cbf1736d (diff)
MLK-15043-2: ASoC: imx-cs42888: fix noise issue with FE-BE case
The case is "aplay -Dhw:0,1 -d 5 -r 8000 -f S16_LE -c 9 audio8k16b9c.wav", which is to playback 9 channel bitstream. But the maximum supported channel of codec is 8, ALSA didn't return error for this case, but continue to playback. The reason is that in FE-BE case, ASLA only get the FE's hw parameter for constraint list, omit the BE's parameter. This patch is to merge BE's parameter to FE. in this situation with the 9 channel case, ASLA will return error "aplay: set_params:1303: Channels count non available" Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com> (cherry picked from commit cfe36e2e7fce578eeac9a36eac04db2584e6e92e)
Diffstat (limited to 'sound/soc/fsl/imx-cs42888.c')
-rw-r--r--sound/soc/fsl/imx-cs42888.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/fsl/imx-cs42888.c b/sound/soc/fsl/imx-cs42888.c
index 43a1584a688f..fc5f10906920 100644
--- a/sound/soc/fsl/imx-cs42888.c
+++ b/sound/soc/fsl/imx-cs42888.c
@@ -277,6 +277,7 @@ static struct snd_soc_dai_link imx_cs42888_dai[] = {
.ignore_pmdown_time = 1,
.dpcm_playback = 1,
.dpcm_capture = 1,
+ .dpcm_merged_chan = 1,
},
{
.name = "HiFi-ASRC-BE",