diff options
| author | Shengjiu Wang <shengjiu.wang@freescale.com> | 2017-03-14 13:09:55 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:26:18 +0800 |
| commit | 7b445234dfaf4c75f982f83257ea2c75f7aa0299 (patch) | |
| tree | c4fb1b7d071eb9b26004fe8422b54b79d66270ca | |
| parent | 17eab945c26af51419dc9aeb6d7b5ce80ad85781 (diff) | |
MLK-14447: ASoC: fsl_ssi: Fix Capture and Playback with i2s mode
Fixes: 95461157dea0 ("MLK-14316 ASoC: fsl_ssi: Fix playback and capture
with mono stream")
This commit (95461157dea0) cause a side effect for i2s mode, for it clears
the setting of I2S_MODE, the basic idea is the set_fmt() function should
not touch the I2S_MODE and NET mode of SCR.
Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
| -rw-r--r-- | sound/soc/fsl/fsl_ssi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index ac24ed62ceaa..219744631c28 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -3,7 +3,8 @@ * * Author: Timur Tabi <timur@freescale.com> * - * Copyright 2007-2015 Freescale Semiconductor, Inc. + * Copyright 2007-2015, Freescale Semiconductor, Inc. + * Copyright 2017 NXP * * This file is licensed under the terms of the GNU General Public License * version 2. This program is licensed "as is" without any warranty of any @@ -944,7 +945,7 @@ static int _fsl_ssi_set_dai_fmt(struct device *dev, fsl_ssi_setup_reg_vals(ssi_private); regmap_read(regs, CCSR_SSI_SCR, &scr); - scr &= ~(CCSR_SSI_SCR_SYN | CCSR_SSI_SCR_I2S_MODE_MASK); + scr &= ~CCSR_SSI_SCR_SYN; scr |= CCSR_SSI_SCR_SYNC_TX_FS; mask = CCSR_SSI_STCR_TXBIT0 | CCSR_SSI_STCR_TFDIR | CCSR_SSI_STCR_TXDIR | |