From: "Clément Péron" <peron.clem@gmail.com>
To: Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
Rob Herring <robh+dt@kernel.org>, Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>
Cc: devicetree@vger.kernel.org,
"Jernej Skrabec" <jernej.skrabec@siol.net>,
alsa-devel@alsa-project.org,
"Samuel Holland" <samuel@sholland.org>,
linux-kernel@vger.kernel.org, "Takashi Iwai" <tiwai@suse.com>,
"Marcus Cooper" <codekipper@gmail.com>,
linux-sunxi@googlegroups.com,
"Clément Péron" <peron.clem@gmail.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 02/22] ASoC: sun4i-i2s: Change set_chan_cfg() params
Date: Mon, 21 Sep 2020 12:27:11 +0200 [thread overview]
Message-ID: <20200921102731.747736-3-peron.clem@gmail.com> (raw)
In-Reply-To: <20200921102731.747736-1-peron.clem@gmail.com>
As slots and slot_width can be overwritter in case set_tdm() is
called. Avoid to have this logic in set_chan_cfg().
Instead pass the required values as params to set_chan_cfg().
This also fix a bug when i2s->slot_width is set for TDM but not
properly used in set_chan_cfg().
Suggested-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
sound/soc/sunxi/sun4i-i2s.c | 36 ++++++++++++++----------------------
1 file changed, 14 insertions(+), 22 deletions(-)
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index 2baf6c276280..0633b9fba3d7 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -177,8 +177,9 @@ struct sun4i_i2s_quirks {
unsigned long (*get_bclk_parent_rate)(const struct sun4i_i2s *);
s8 (*get_sr)(const struct sun4i_i2s *, int);
s8 (*get_wss)(const struct sun4i_i2s *, int);
- int (*set_chan_cfg)(const struct sun4i_i2s *,
- const struct snd_pcm_hw_params *);
+ int (*set_chan_cfg)(const struct sun4i_i2s *i2s,
+ unsigned int channels, unsigned int slots,
+ unsigned int slot_width);
int (*set_fmt)(const struct sun4i_i2s *, unsigned int);
};
@@ -414,10 +415,9 @@ static s8 sun8i_i2s_get_sr_wss(const struct sun4i_i2s *i2s, int width)
}
static int sun4i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
- const struct snd_pcm_hw_params *params)
+ unsigned int channels, unsigned int slots,
+ unsigned int slot_width)
{
- unsigned int channels = params_channels(params);
-
/* Map the channels for playback and capture */
regmap_write(i2s->regmap, SUN4I_I2S_TX_CHAN_MAP_REG, 0x76543210);
regmap_write(i2s->regmap, SUN4I_I2S_RX_CHAN_MAP_REG, 0x00003210);
@@ -434,15 +434,11 @@ static int sun4i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
}
static int sun8i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
- const struct snd_pcm_hw_params *params)
+ unsigned int channels, unsigned int slots,
+ unsigned int slot_width)
{
- unsigned int channels = params_channels(params);
- unsigned int slots = channels;
unsigned int lrck_period;
- if (i2s->slots)
- slots = i2s->slots;
-
/* Map the channels for playback and capture */
regmap_write(i2s->regmap, SUN8I_I2S_TX_CHAN_MAP_REG, 0x76543210);
regmap_write(i2s->regmap, SUN8I_I2S_RX_CHAN_MAP_REG, 0x76543210);
@@ -467,11 +463,11 @@ static int sun8i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
case SND_SOC_DAIFMT_DSP_B:
case SND_SOC_DAIFMT_LEFT_J:
case SND_SOC_DAIFMT_RIGHT_J:
- lrck_period = params_physical_width(params) * slots;
+ lrck_period = slot_width * slots;
break;
case SND_SOC_DAIFMT_I2S:
- lrck_period = params_physical_width(params);
+ lrck_period = slot_width;
break;
default:
@@ -490,15 +486,11 @@ static int sun8i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
}
static int sun50i_h6_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
- const struct snd_pcm_hw_params *params)
+ unsigned int channels, unsigned int slots,
+ unsigned int slot_width)
{
- unsigned int channels = params_channels(params);
- unsigned int slots = channels;
unsigned int lrck_period;
- if (i2s->slots)
- slots = i2s->slots;
-
/* Map the channels for playback and capture */
regmap_write(i2s->regmap, SUN50I_H6_I2S_TX_CHAN_MAP1_REG, 0x76543210);
regmap_write(i2s->regmap, SUN50I_H6_I2S_RX_CHAN_MAP1_REG, 0x76543210);
@@ -523,11 +515,11 @@ static int sun50i_h6_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
case SND_SOC_DAIFMT_DSP_B:
case SND_SOC_DAIFMT_LEFT_J:
case SND_SOC_DAIFMT_RIGHT_J:
- lrck_period = params_physical_width(params) * slots;
+ lrck_period = slot_width * slots;
break;
case SND_SOC_DAIFMT_I2S:
- lrck_period = params_physical_width(params);
+ lrck_period = slot_width;
break;
default:
@@ -563,7 +555,7 @@ static int sun4i_i2s_hw_params(struct snd_pcm_substream *substream,
if (i2s->slot_width)
slot_width = i2s->slot_width;
- ret = i2s->variant->set_chan_cfg(i2s, params);
+ ret = i2s->variant->set_chan_cfg(i2s, channels, slots, slot_width);
if (ret < 0) {
dev_err(dai->dev, "Invalid channel configuration\n");
return ret;
--
2.25.1
next prev parent reply other threads:[~2020-09-21 10:28 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-21 10:27 [PATCH v4 00/22] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
2020-09-21 10:27 ` [PATCH v4 01/22] ASoC: sun4i-i2s: Add support for H6 I2S Clément Péron
2020-09-21 10:27 ` Clément Péron [this message]
2020-09-21 12:29 ` [PATCH v4 02/22] ASoC: sun4i-i2s: Change set_chan_cfg() params Maxime Ripard
2020-09-21 17:15 ` Clément Péron
2020-09-21 18:23 ` Mark Brown
2020-09-28 8:55 ` Maxime Ripard
2020-09-21 10:27 ` [PATCH v4 03/22] ASoC: sun4i-i2s: Change get_sr() and get_wss() to be more explicit Clément Péron
2020-09-21 13:55 ` Maxime Ripard
2020-09-21 17:22 ` Clément Péron
2020-09-21 10:27 ` [PATCH v4 04/22] dt-bindings: ASoC: sun4i-i2s: Add H6 compatible Clément Péron
2020-09-21 10:27 ` [PATCH v4 05/22] ASoC: sun4i-i2s: Set sign extend sample Clément Péron
2020-09-21 10:27 ` [PATCH v4 06/22] ASoc: sun4i-i2s: Add 20 and 24 bit support Clément Péron
2020-09-21 10:27 ` [PATCH v4 07/22] ASoC: sun4i-i2s: Fix sun8i volatile regs Clément Péron
2020-09-21 10:27 ` [PATCH v4 08/22] ASoC: sun4i-i2s: Fix setting of FIFO modes Clément Péron
2020-09-21 10:27 ` [PATCH v4 09/22] arm64: dts: allwinner: h6: Add HDMI audio node Clément Péron
2020-09-21 13:59 ` Maxime Ripard
2020-09-21 17:23 ` Clément Péron
2020-09-21 18:37 ` Jernej Škrabec
2020-09-28 8:43 ` Maxime Ripard
2020-09-28 14:27 ` Clément Péron
2020-09-30 10:19 ` Maxime Ripard
2020-11-01 15:27 ` Clément Péron
2020-11-02 10:21 ` Maxime Ripard
2020-11-02 11:19 ` Clément Péron
2020-09-21 18:29 ` Mark Brown
2020-09-21 10:27 ` [PATCH v4 10/22] arm64: dts: allwinner: h6: Enable HDMI sound for Beelink GS1 Clément Péron
2020-09-21 10:27 ` [PATCH v4 11/22] arm: dts: sunxi: h3/h5: Add DAI node for HDMI Clément Péron
2020-09-21 10:27 ` [PATCH v4 12/22] arm: dts: sunxi: h3/h5: Add HDMI audio Clément Péron
2020-09-21 10:27 ` [PATCH v4 13/22] arm64: dts: allwinner: a64: Add DAI node for HDMI Clément Péron
2020-09-21 10:27 ` [PATCH v4 14/22] arm64: dts: allwinner: a64: Add HDMI audio Clément Péron
2020-09-21 10:27 ` [PATCH v4 15/22] arm: sun8i: h3: Add HDMI audio to Orange Pi 2 Clément Péron
2020-09-21 10:27 ` [PATCH v4 16/22] arm: sun8i: h3: Add HDMI audio to Beelink X2 Clément Péron
2020-09-21 10:27 ` [PATCH v4 17/22] arm64: dts: allwinner: a64: Add HDMI audio to Pine64 Clément Péron
2020-09-21 10:27 ` [PATCH v4 18/22] arm64: dts: allwinner: Enable HDMI audio on Orange Pi PC 2 Clément Péron
2020-09-21 10:27 ` [PATCH v4 19/22] ARM: dts: sun8i-h3: Enable HDMI audio on Orange Pi PC/One Clément Péron
2020-09-21 10:27 ` [PATCH v4 20/22] arm64: dts: sun50i-h6-orangepi-3: Enable HDMI audio Clément Péron
2020-09-21 10:27 ` [PATCH v4 21/22] arm64: defconfig: Enable Allwinner i2s driver Clément Péron
2020-09-21 10:27 ` [PATCH v4 22/22] ASoC: sun4i-i2s: fix coding-style for callback definition Clément Péron
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=20200921102731.747736-3-peron.clem@gmail.com \
--to=peron.clem@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=codekipper@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=jernej.skrabec@siol.net \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=mripard@kernel.org \
--cc=robh+dt@kernel.org \
--cc=samuel@sholland.org \
--cc=tiwai@suse.com \
--cc=wens@csie.org \
/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).