Unverified Commit 1bf56843 authored by Xiaotan Luo's avatar Xiaotan Luo Committed by Mark Brown
Browse files

ASoC: rockchip: i2s: Fixup config for DAIFMT_DSP_A/B 



- DSP_A: PCM delay 1 bit mode, L data MSB after FRM LRC
- DSP_B: PCM no delay mode, L data MSB during FRM LRC

Signed-off-by: default avatarXiaotan Luo <lxt@rock-chips.com>
Signed-off-by: default avatarSugar Zhang <sugar.zhang@rock-chips.com>
Link: https://lore.kernel.org/r/1629950562-14281-3-git-send-email-sugar.zhang@rock-chips.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 296713a3

sound/soc/rockchip/rockchip_i2s.c

+8 −8
Original line number Diff line number Diff line
@@ -234,12 +234,12 @@ static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai, 
	case SND_SOC_DAIFMT_I2S:

		val = I2S_TXCR_IBM_NORMAL;

		break;

	case SND_SOC_DAIFMT_DSP_A: /* PCM no delay mode */

		val = I2S_TXCR_TFS_PCM;

		break;

	case SND_SOC_DAIFMT_DSP_B: /* PCM delay 1 mode */

	case SND_SOC_DAIFMT_DSP_A: /* PCM delay 1 bit mode */

		val = I2S_TXCR_TFS_PCM | I2S_TXCR_PBM_MODE(1);

		break;

	case SND_SOC_DAIFMT_DSP_B: /* PCM no delay mode */

		val = I2S_TXCR_TFS_PCM;

		break;

	default:

		ret = -EINVAL;

		goto err_pm_put;
@@ -258,12 +258,12 @@ static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai, 
	case SND_SOC_DAIFMT_I2S:

		val = I2S_RXCR_IBM_NORMAL;

		break;

	case SND_SOC_DAIFMT_DSP_A: /* PCM no delay mode */

		val = I2S_RXCR_TFS_PCM;

		break;

	case SND_SOC_DAIFMT_DSP_B: /* PCM delay 1 mode */

	case SND_SOC_DAIFMT_DSP_A: /* PCM delay 1 bit mode */

		val = I2S_RXCR_TFS_PCM | I2S_RXCR_PBM_MODE(1);

		break;

	case SND_SOC_DAIFMT_DSP_B: /* PCM no delay mode */

		val = I2S_RXCR_TFS_PCM;

		break;

	default:

		ret = -EINVAL;

		goto err_pm_put;