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: "Jaroslav Kysela" <perex@perex.cz>,
"Takashi Iwai" <tiwai@suse.com>,
"Marcus Cooper" <codekipper@gmail.com>,
"Jernej Skrabec" <jernej.skrabec@siol.net>,
alsa-devel@alsa-project.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com,
"Clément Péron" <peron.clem@gmail.com>,
"Samuel Holland" <samuel@sholland.org>
Subject: [PATCH v3 02/19] ASoC: sun4i-i2s: Change set_chan_cfg params
Date: Sun, 20 Sep 2020 20:07:41 +0200 [thread overview]
Message-ID: <20200920180758.592217-3-peron.clem@gmail.com> (raw)
In-Reply-To: <20200920180758.592217-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 | 35 +++++++++++++----------------------
1 file changed, 13 insertions(+), 22 deletions(-)
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index 348057464bed..246d4a45edae 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -177,8 +177,8 @@ 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 *, unsigned int,
+ unsigned int, unsigned int);
int (*set_fmt)(const struct sun4i_i2s *, unsigned int);
};
@@ -414,10 +414,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 +433,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 +462,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 +485,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 +514,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 +554,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-20 18:09 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-20 18:07 [PATCH v3 00/19] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
2020-09-20 18:07 ` [PATCH v3 01/19] ASoC: sun4i-i2s: Add support for H6 I2S Clément Péron
2020-09-20 18:39 ` Samuel Holland
2020-09-20 19:38 ` Clément Péron
2020-09-20 18:07 ` Clément Péron [this message]
2020-09-20 18:07 ` [PATCH v3 03/19] dt-bindings: ASoC: sun4i-i2s: Add H6 compatible Clément Péron
2020-09-20 18:07 ` [PATCH v3 04/19] ASoC: sun4i-i2s: Set sign extend sample Clément Péron
2020-09-20 18:07 ` [PATCH v3 05/19] ASoc: sun4i-i2s: Add 20 and 24 bit support Clément Péron
2020-09-20 18:45 ` Samuel Holland
2020-09-20 21:32 ` Clément Péron
2020-09-20 18:07 ` [PATCH v3 06/19] ASoC: sun4i-i2s: Fix sun8i volatile regs Clément Péron
2020-09-20 18:52 ` Samuel Holland
2020-09-20 20:05 ` Clément Péron
2020-09-20 18:07 ` [PATCH v3 07/19] arm64: dts: allwinner: h6: Add HDMI audio node Clément Péron
2020-09-20 18:07 ` [PATCH v3 08/19] arm64: dts: allwinner: h6: Enable HDMI sound for Beelink GS1 Clément Péron
2020-09-20 18:07 ` [PATCH v3 09/19] arm: dts: sunxi: h3/h5: Add DAI node for HDMI Clément Péron
2020-09-20 18:07 ` [PATCH v3 10/19] arm: dts: sunxi: h3/h5: Add HDMI audio Clément Péron
2020-09-20 18:07 ` [PATCH v3 11/19] arm64: dts: allwinner: a64: Add DAI node for HDMI Clément Péron
2020-09-20 18:07 ` [PATCH v3 12/19] arm64: dts: allwinner: a64: Add HDMI audio Clément Péron
2020-09-20 18:07 ` [PATCH v3 13/19] arm: sun8i: h3: Add HDMI audio to Orange Pi 2 Clément Péron
2020-09-20 18:07 ` [PATCH v3 14/19] arm: sun8i: h3: Add HDMI audio to Beelink X2 Clément Péron
2020-09-20 18:07 ` [PATCH v3 15/19] arm64: dts: allwinner: a64: Add HDMI audio to Pine64 Clément Péron
2020-09-20 18:07 ` [PATCH v3 16/19] arm64: dts: allwinner: Enable HDMI audio on Orange Pi PC 2 Clément Péron
2020-09-20 18:07 ` [PATCH v3 17/19] ARM: dts: sun8i-h3: Enable HDMI audio on Orange Pi PC/One Clément Péron
2020-09-20 18:07 ` [PATCH v3 18/19] arm64: dts: sun50i-h6-orangepi-3: Enable HDMI audio Clément Péron
2020-09-20 18:07 ` [PATCH v3 19/19] arm64: defconfig: Enable Allwinner i2s driver 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=20200920180758.592217-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=perex@perex.cz \
--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).