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 v3 08/14] ASoC: rockchip: i2s: Fixup config for DAIFMT_DSP_A/B
Date: Thu, 26 Aug 2021 12:02:36 +0800 [thread overview]
Message-ID: <1629950562-14281-3-git-send-email-sugar.zhang@rock-chips.com> (raw)
In-Reply-To: <1629950441-14118-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 v3: None
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-26 4:03 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-26 4:00 [PATCH v3 0/14] Patches to update for rockchip i2s Sugar Zhang
2021-08-26 4:00 ` Sugar Zhang
2021-08-26 4:00 ` Sugar Zhang
2021-08-26 4:01 ` [PATCH v3 01/14] ASoC: rockchip: i2s: Add support for set bclk ratio Sugar Zhang
2021-08-26 4:01 ` [PATCH v3 02/14] ASoC: rockchip: i2s: Fixup clk div error Sugar Zhang
2021-08-26 4:01 ` Sugar Zhang
2021-08-26 4:01 ` Sugar Zhang
2021-08-26 4:01 ` [PATCH v3 03/14] ASoC: rockchip: i2s: Improve dma data transfer efficiency Sugar Zhang
2021-08-26 4:01 ` Sugar Zhang
2021-08-26 4:01 ` Sugar Zhang
2021-08-26 4:01 ` [PATCH v3 04/14] ASoC: rockchip: i2s: Fix regmap_ops hang Sugar Zhang
2021-08-26 4:01 ` Sugar Zhang
2021-08-26 4:01 ` Sugar Zhang
2021-08-26 4:01 ` [PATCH v3 05/14] ASoC: rockchip: i2s: Fix concurrency between tx/rx Sugar Zhang
2021-08-26 4:01 ` Sugar Zhang
2021-08-26 4:01 ` Sugar Zhang
2021-08-26 12:52 ` Mark Brown
2021-08-26 12:52 ` Mark Brown
2021-08-26 12:52 ` Mark Brown
2021-08-27 1:37 ` sugar zhang
2021-08-27 1:37 ` sugar zhang
2021-08-27 1:37 ` sugar zhang
2021-08-26 4:02 ` [PATCH v3 06/14] ASoC: rockchip: i2s: Reset the controller if soft reset failed Sugar Zhang
2021-08-26 4:02 ` Sugar Zhang
2021-08-26 4:02 ` Sugar Zhang
2021-08-26 4:02 ` [PATCH v3 07/14] ASoC: dt-bindings: rockchip: Document reset property for i2s Sugar Zhang
2021-08-26 4:02 ` Sugar Zhang [this message]
2021-08-26 4:02 ` [PATCH v3 09/14] ASoC: rockchip: i2s: Make playback/capture optional Sugar Zhang
2021-08-26 4:02 ` Sugar Zhang
2021-08-26 4:02 ` Sugar Zhang
2021-08-26 4:02 ` [PATCH v3 10/14] ASoC: rockchip: i2s: Add compatible for more SoCs Sugar Zhang
2021-08-26 4:03 ` [PATCH v3 11/14] ASoC: dt-bindings: rockchip: Add compatible strings " Sugar Zhang
2021-08-26 4:03 ` Sugar Zhang
2021-08-26 4:03 ` Sugar Zhang
2021-08-26 4:03 ` [PATCH v3 12/14] ASoC: rockchip: i2s: Add support for frame inversion Sugar Zhang
2021-08-26 4:03 ` Sugar Zhang
2021-08-26 4:03 ` Sugar Zhang
2021-08-26 4:03 ` [PATCH v3 13/14] ASoC: rockchip: i2s: Add support for TRCM property Sugar Zhang
2021-08-26 4:03 ` Sugar Zhang
2021-08-26 4:03 ` Sugar Zhang
2021-08-26 4:03 ` [PATCH v3 14/14] ASoC: dt-bindings: rockchip: i2s: Document property TRCM Sugar Zhang
2021-08-26 4:03 ` Sugar Zhang
2021-08-26 4:03 ` Sugar Zhang
2021-08-26 14:15 ` (subset) [PATCH v3 0/14] Patches to update for rockchip i2s Mark Brown
2021-08-26 14:15 ` Mark Brown
2021-08-26 14:15 ` Mark Brown
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=1629950562-14281-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.