From: Sugar Zhang <sugar.zhang@rock-chips.com>
To: broonie@kernel.org, heiko@sntech.de
Cc: linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org,
alsa-devel@alsa-project.org, Xiaotan Luo <lxt@rock-chips.com>,
Sugar Zhang <sugar.zhang@rock-chips.com>
Subject: [PATCH v2 08/15] ASoC: rockchip: i2s: Fixup config for DAIFMT_DSP_A/B
Date: Tue, 24 Aug 2021 17:17:55 +0800 [thread overview]
Message-ID: <1629796682-4170-3-git-send-email-sugar.zhang@rock-chips.com> (raw)
In-Reply-To: <1629796561-4025-1-git-send-email-sugar.zhang@rock-chips.com>
From: Xiaotan Luo <lxt@rock-chips.com>
- 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: Xiaotan Luo <lxt@rock-chips.com>
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
---
Changes in v2: None
sound/soc/rockchip/rockchip_i2s.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index 78321ee..15e2690 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -259,12 +259,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;
@@ -283,12 +283,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;
--
2.7.4
next prev parent reply other threads:[~2021-08-24 9:18 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-24 9:16 [PATCH v2 0/15] Patches to update for rockchip i2s Sugar Zhang
2021-08-24 9:17 ` [PATCH v2 01/15] ASoC: rockchip: i2s: Add support for set bclk ratio Sugar Zhang
2021-08-24 9:17 ` [PATCH v2 02/15] ASoC: rockchip: i2s: Fixup clk div error Sugar Zhang
2021-08-24 9:17 ` [PATCH v2 03/15] ASoC: rockchip: i2s: Improve dma data transfer efficiency Sugar Zhang
2021-08-24 9:17 ` [PATCH v2 04/15] ASoC: rockchip: i2s: Fix regmap_ops hang Sugar Zhang
2021-08-24 9:17 ` [PATCH v2 05/15] ASoC: rockchip: i2s: Fix concurrency between tx/rx Sugar Zhang
2021-08-24 9:17 ` [PATCH v2 06/15] ASoC: rockchip: i2s: Reset the controller if soft reset failed Sugar Zhang
2021-08-24 9:17 ` [PATCH v2 07/15] ASoC: dt-bindings: rockchip: Document reset property for i2s Sugar Zhang
2021-08-24 17:01 ` Rob Herring
2021-08-24 9:17 ` Sugar Zhang [this message]
2021-08-24 9:17 ` [PATCH v2 09/15] ASoC: rockchip: i2s: Add property to specify play/cap capability Sugar Zhang
2021-08-24 9:17 ` [PATCH v2 10/15] ASoC: dt-bindings: rockchip: i2s: Document property for playback/capture Sugar Zhang
2021-08-24 17:06 ` Rob Herring
2021-08-25 9:30 ` [PATCH v2 10/15] ASoC: dt-bindings: rockchip: i2s: Document property for playback/capture【请注意,邮件由robherring2@gmail.com代发】 sugar zhang
2021-08-24 9:18 ` [PATCH v2 11/15] ASoC: rockchip: i2s: Add compatible for more SoCs Sugar Zhang
2021-08-24 9:18 ` [PATCH v2 12/15] ASoC: dt-bindings: rockchip: Add compatible strings " Sugar Zhang
2021-08-24 17:07 ` Rob Herring
2021-08-24 9:18 ` [PATCH v2 13/15] ASoC: rockchip: i2s: Add support for frame inversion Sugar Zhang
2021-08-24 9:18 ` [PATCH v2 14/15] ASoC: rockchip: i2s: Add support for TRCM property Sugar Zhang
2021-08-24 9:18 ` [PATCH v2 15/15] ASoC: dt-bindings: rockchip: i2s: Document property TRCM Sugar Zhang
2021-08-24 17:08 ` Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1629796682-4170-3-git-send-email-sugar.zhang@rock-chips.com \
--to=sugar.zhang@rock-chips.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=heiko@sntech.de \
--cc=linux-rockchip@lists.infradead.org \
--cc=lxt@rock-chips.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).