From 99d500bf3ce1a3fc5413e964dfd3cde568405d33 Mon Sep 17 00:00:00 2001 From: Shengjiu Wang Date: Thu, 29 Aug 2019 14:07:18 +0800 Subject: [PATCH] =?utf8?q?MLK-22521-1:=20ASoC:=20fsl=5Feasrc=EF=BC=9AIEC95?= =?utf8?q?8=20is=20only=20supported=20for=20output?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit IEC958 is only supported for output according to the RM Signed-off-by: Shengjiu Wang Reviewed-by: Viorel Suman (cherry picked from commit bf36888526c420776c18ca06548b9d3798200beb) --- sound/soc/fsl/fsl_easrc.c | 6 +++--- sound/soc/fsl/fsl_easrc_m2m.c | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sound/soc/fsl/fsl_easrc.c b/sound/soc/fsl/fsl_easrc.c index 347f2577f919..f7cc9ddd9000 100644 --- a/sound/soc/fsl/fsl_easrc.c +++ b/sound/soc/fsl/fsl_easrc.c @@ -43,8 +43,7 @@ extern struct snd_soc_component_driver fsl_easrc_dma_component; SNDRV_PCM_FMTBIT_U32_LE | \ SNDRV_PCM_FMTBIT_S20_3LE | \ SNDRV_PCM_FMTBIT_U20_3LE | \ - SNDRV_PCM_FMTBIT_FLOAT_LE | \ - SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE) + SNDRV_PCM_FMTBIT_FLOAT_LE) static int fsl_easrc_iec958_put_bits(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) @@ -1817,7 +1816,8 @@ static struct snd_soc_dai_driver fsl_easrc_dai = { .rate_min = 8000, .rate_max = 768000, .rates = SNDRV_PCM_RATE_KNOT, - .formats = FSL_EASRC_FORMATS, + .formats = FSL_EASRC_FORMATS | + SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE, }, .ops = &fsl_easrc_dai_ops, }; diff --git a/sound/soc/fsl/fsl_easrc_m2m.c b/sound/soc/fsl/fsl_easrc_m2m.c index af088d8b4975..3a9429a41a8b 100644 --- a/sound/soc/fsl/fsl_easrc_m2m.c +++ b/sound/soc/fsl/fsl_easrc_m2m.c @@ -441,7 +441,8 @@ static long fsl_easrc_ioctl_req_context(struct fsl_easrc_m2m *m2m, m2m->ctx_hold = 1; req.index = m2m->ctx->index; req.supported_in_format = FSL_EASRC_FORMATS; - req.supported_out_format = FSL_EASRC_FORMATS; + req.supported_out_format = FSL_EASRC_FORMATS | + SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE; spin_unlock_irqrestore(&m2m->lock, lock_flags); ret = copy_to_user(user, &req, sizeof(req)); -- 2.17.1