diff options
| author | Shengjiu Wang <shengjiu.wang@freescale.com> | 2017-06-15 13:19:34 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-11-25 15:50:10 +0800 |
| commit | e8e2ecd38b71cbcaf45ceda86324da1689652764 (patch) | |
| tree | 54fc8ecc6376316ac4eff9570f68922b432f1a50 /sound | |
| parent | 27496f3b2dde6f0bd4b964d54bfb438e0fdef597 (diff) | |
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 <shengjiu.wang@freescale.com>
(cherry picked from commit 7195ad8ff56857028a6990296cc06e1c08a4e48e)
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/fsl/imx-mqs.c | 1 | ||||
| -rw-r--r-- | sound/soc/fsl/imx-wm8960.c | 1 | ||||
| -rw-r--r-- | sound/soc/fsl/imx-wm8962.c | 1 |
3 files changed, 3 insertions, 0 deletions
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", diff --git a/sound/soc/fsl/imx-wm8960.c b/sound/soc/fsl/imx-wm8960.c index 430a5e409bd0..2594d256dfc6 100644 --- a/sound/soc/fsl/imx-wm8960.c +++ b/sound/soc/fsl/imx-wm8960.c @@ -403,6 +403,7 @@ static struct snd_soc_dai_link imx_wm8960_dai[] = { .ignore_pmdown_time = 1, .dpcm_playback = 1, .dpcm_capture = 1, + .dpcm_merged_chan = 1, }, { .name = "HiFi-ASRC-BE", diff --git a/sound/soc/fsl/imx-wm8962.c b/sound/soc/fsl/imx-wm8962.c index b096ff5e1bbb..d408fd359c75 100644 --- a/sound/soc/fsl/imx-wm8962.c +++ b/sound/soc/fsl/imx-wm8962.c @@ -712,6 +712,7 @@ audmux_bypass: data->dai[1].ignore_pmdown_time = 1; data->dai[1].dpcm_playback = 1; data->dai[1].dpcm_capture = 1; + data->dai[1].dpcm_merged_chan = 1; data->dai[2].name = "HiFi-ASRC-BE"; data->dai[2].stream_name = "HiFi-ASRC-BE"; |