From e8e2ecd38b71cbcaf45ceda86324da1689652764 Mon Sep 17 00:00:00 2001 From: Shengjiu Wang Date: Thu, 15 Jun 2017 13:19:34 +0800 Subject: MLK-15063: ASoC: fsl: add dpcm_merged_chan for machine driver Same as commit cfe36e2e7fce ("MLK-15043-2: ASoC: imx-cs42888: fix noise issue with FE-BE case"). need to add same configuration for imx-wm8960, imx-wm8962, imx-mqs. Signed-off-by: Shengjiu Wang (cherry picked from commit 7195ad8ff56857028a6990296cc06e1c08a4e48e) --- sound/soc/fsl/imx-mqs.c | 1 + 1 file changed, 1 insertion(+) (limited to 'sound/soc/fsl/imx-mqs.c') diff --git a/sound/soc/fsl/imx-mqs.c b/sound/soc/fsl/imx-mqs.c index a09a52a7823e..a39363590711 100644 --- a/sound/soc/fsl/imx-mqs.c +++ b/sound/soc/fsl/imx-mqs.c @@ -120,6 +120,7 @@ static struct snd_soc_dai_link imx_mqs_dai[] = { .ignore_pmdown_time = 1, .dpcm_playback = 1, .dpcm_capture = 0, + .dpcm_merged_chan = 1, }, { .name = "HiFi-ASRC-BE", -- cgit v1.2.3