From 27496f3b2dde6f0bd4b964d54bfb438e0fdef597 Mon Sep 17 00:00:00 2001 From: Shengjiu Wang Date: Wed, 14 Jun 2017 17:40:17 +0800 Subject: 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 (cherry picked from commit cfe36e2e7fce578eeac9a36eac04db2584e6e92e) --- sound/soc/fsl/imx-cs42888.c | 1 + 1 file changed, 1 insertion(+) (limited to 'sound/soc/fsl/imx-cs42888.c') 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", -- cgit v1.2.3