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>
Subject: [PATCH v4 03/22] ASoC: sun4i-i2s: Change get_sr() and get_wss() to be more explicit
Date: Mon, 21 Sep 2020 12:27:12 +0200 [thread overview]
Message-ID: <20200921102731.747736-4-peron.clem@gmail.com> (raw)
In-Reply-To: <20200921102731.747736-1-peron.clem@gmail.com>
We are actually using a complex formula to just return a bunch of
simple values. Also this formula is wrong for sun4i.
Replace this with a simpler switch case.
Also drop the i2s params not used.
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
sound/soc/sunxi/sun4i-i2s.c | 69 +++++++++++++++++++++++--------------
1 file changed, 44 insertions(+), 25 deletions(-)
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index 0633b9fba3d7..11bbcbe24d6b 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -175,8 +175,8 @@ struct sun4i_i2s_quirks {
unsigned int num_mclk_dividers;
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 (*get_sr)(unsigned int width);
+ int (*get_wss)(unsigned int width);
int (*set_chan_cfg)(const struct sun4i_i2s *i2s,
unsigned int channels, unsigned int slots,
unsigned int slot_width);
@@ -381,37 +381,56 @@ static int sun4i_i2s_set_clk_rate(struct snd_soc_dai *dai,
return 0;
}
-static s8 sun4i_i2s_get_sr(const struct sun4i_i2s *i2s, int width)
+static int sun4i_i2s_get_sr(unsigned int width)
{
- if (width < 16 || width > 24)
- return -EINVAL;
-
- if (width % 4)
- return -EINVAL;
+ switch (width) {
+ case 16:
+ return 0x0;
+ case 20:
+ return 0x1;
+ case 24:
+ return 0x2;
+ }
- return (width - 16) / 4;
+ return -EINVAL;
}
-static s8 sun4i_i2s_get_wss(const struct sun4i_i2s *i2s, int width)
+static int sun4i_i2s_get_wss(unsigned int width)
{
- if (width < 16 || width > 32)
- return -EINVAL;
-
- if (width % 4)
- return -EINVAL;
+ switch (width) {
+ case 16:
+ return 0x0;
+ case 20:
+ return 0x1;
+ case 24:
+ return 0x2;
+ case 32:
+ return 0x3;
+ }
- return (width - 16) / 4;
+ return -EINVAL;
}
-static s8 sun8i_i2s_get_sr_wss(const struct sun4i_i2s *i2s, int width)
+static int sun8i_i2s_get_sr_wss(unsigned int width)
{
- if (width % 4)
- return -EINVAL;
-
- if (width < 8 || width > 32)
- return -EINVAL;
+ switch (width) {
+ case 8:
+ return 0x1;
+ case 12:
+ return 0x2;
+ case 16:
+ return 0x3;
+ case 20:
+ return 0x4;
+ case 24:
+ return 0x5;
+ case 28:
+ return 0x6;
+ case 32:
+ return 0x7;
+ }
- return (width - 8) / 4 + 1;
+ return -EINVAL;
}
static int sun4i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
@@ -572,11 +591,11 @@ static int sun4i_i2s_hw_params(struct snd_pcm_substream *substream,
}
i2s->playback_dma_data.addr_width = width;
- sr = i2s->variant->get_sr(i2s, word_size);
+ sr = i2s->variant->get_sr(word_size);
if (sr < 0)
return -EINVAL;
- wss = i2s->variant->get_wss(i2s, slot_width);
+ wss = i2s->variant->get_wss(slot_width);
if (wss < 0)
return -EINVAL;
--
2.25.1
WARNING: multiple messages have this Message-ID (diff)
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, 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 03/22] ASoC: sun4i-i2s: Change get_sr() and get_wss() to be more explicit
Date: Mon, 21 Sep 2020 12:27:12 +0200 [thread overview]
Message-ID: <20200921102731.747736-4-peron.clem@gmail.com> (raw)
In-Reply-To: <20200921102731.747736-1-peron.clem@gmail.com>
We are actually using a complex formula to just return a bunch of
simple values. Also this formula is wrong for sun4i.
Replace this with a simpler switch case.
Also drop the i2s params not used.
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
sound/soc/sunxi/sun4i-i2s.c | 69 +++++++++++++++++++++++--------------
1 file changed, 44 insertions(+), 25 deletions(-)
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index 0633b9fba3d7..11bbcbe24d6b 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -175,8 +175,8 @@ struct sun4i_i2s_quirks {
unsigned int num_mclk_dividers;
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 (*get_sr)(unsigned int width);
+ int (*get_wss)(unsigned int width);
int (*set_chan_cfg)(const struct sun4i_i2s *i2s,
unsigned int channels, unsigned int slots,
unsigned int slot_width);
@@ -381,37 +381,56 @@ static int sun4i_i2s_set_clk_rate(struct snd_soc_dai *dai,
return 0;
}
-static s8 sun4i_i2s_get_sr(const struct sun4i_i2s *i2s, int width)
+static int sun4i_i2s_get_sr(unsigned int width)
{
- if (width < 16 || width > 24)
- return -EINVAL;
-
- if (width % 4)
- return -EINVAL;
+ switch (width) {
+ case 16:
+ return 0x0;
+ case 20:
+ return 0x1;
+ case 24:
+ return 0x2;
+ }
- return (width - 16) / 4;
+ return -EINVAL;
}
-static s8 sun4i_i2s_get_wss(const struct sun4i_i2s *i2s, int width)
+static int sun4i_i2s_get_wss(unsigned int width)
{
- if (width < 16 || width > 32)
- return -EINVAL;
-
- if (width % 4)
- return -EINVAL;
+ switch (width) {
+ case 16:
+ return 0x0;
+ case 20:
+ return 0x1;
+ case 24:
+ return 0x2;
+ case 32:
+ return 0x3;
+ }
- return (width - 16) / 4;
+ return -EINVAL;
}
-static s8 sun8i_i2s_get_sr_wss(const struct sun4i_i2s *i2s, int width)
+static int sun8i_i2s_get_sr_wss(unsigned int width)
{
- if (width % 4)
- return -EINVAL;
-
- if (width < 8 || width > 32)
- return -EINVAL;
+ switch (width) {
+ case 8:
+ return 0x1;
+ case 12:
+ return 0x2;
+ case 16:
+ return 0x3;
+ case 20:
+ return 0x4;
+ case 24:
+ return 0x5;
+ case 28:
+ return 0x6;
+ case 32:
+ return 0x7;
+ }
- return (width - 8) / 4 + 1;
+ return -EINVAL;
}
static int sun4i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
@@ -572,11 +591,11 @@ static int sun4i_i2s_hw_params(struct snd_pcm_substream *substream,
}
i2s->playback_dma_data.addr_width = width;
- sr = i2s->variant->get_sr(i2s, word_size);
+ sr = i2s->variant->get_sr(word_size);
if (sr < 0)
return -EINVAL;
- wss = i2s->variant->get_wss(i2s, slot_width);
+ wss = i2s->variant->get_wss(slot_width);
if (wss < 0)
return -EINVAL;
--
2.25.1
WARNING: multiple messages have this Message-ID (diff)
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, linux-kernel@vger.kernel.org,
"Takashi Iwai" <tiwai@suse.com>,
"Jaroslav Kysela" <perex@perex.cz>,
"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 03/22] ASoC: sun4i-i2s: Change get_sr() and get_wss() to be more explicit
Date: Mon, 21 Sep 2020 12:27:12 +0200 [thread overview]
Message-ID: <20200921102731.747736-4-peron.clem@gmail.com> (raw)
In-Reply-To: <20200921102731.747736-1-peron.clem@gmail.com>
We are actually using a complex formula to just return a bunch of
simple values. Also this formula is wrong for sun4i.
Replace this with a simpler switch case.
Also drop the i2s params not used.
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
sound/soc/sunxi/sun4i-i2s.c | 69 +++++++++++++++++++++++--------------
1 file changed, 44 insertions(+), 25 deletions(-)
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index 0633b9fba3d7..11bbcbe24d6b 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -175,8 +175,8 @@ struct sun4i_i2s_quirks {
unsigned int num_mclk_dividers;
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 (*get_sr)(unsigned int width);
+ int (*get_wss)(unsigned int width);
int (*set_chan_cfg)(const struct sun4i_i2s *i2s,
unsigned int channels, unsigned int slots,
unsigned int slot_width);
@@ -381,37 +381,56 @@ static int sun4i_i2s_set_clk_rate(struct snd_soc_dai *dai,
return 0;
}
-static s8 sun4i_i2s_get_sr(const struct sun4i_i2s *i2s, int width)
+static int sun4i_i2s_get_sr(unsigned int width)
{
- if (width < 16 || width > 24)
- return -EINVAL;
-
- if (width % 4)
- return -EINVAL;
+ switch (width) {
+ case 16:
+ return 0x0;
+ case 20:
+ return 0x1;
+ case 24:
+ return 0x2;
+ }
- return (width - 16) / 4;
+ return -EINVAL;
}
-static s8 sun4i_i2s_get_wss(const struct sun4i_i2s *i2s, int width)
+static int sun4i_i2s_get_wss(unsigned int width)
{
- if (width < 16 || width > 32)
- return -EINVAL;
-
- if (width % 4)
- return -EINVAL;
+ switch (width) {
+ case 16:
+ return 0x0;
+ case 20:
+ return 0x1;
+ case 24:
+ return 0x2;
+ case 32:
+ return 0x3;
+ }
- return (width - 16) / 4;
+ return -EINVAL;
}
-static s8 sun8i_i2s_get_sr_wss(const struct sun4i_i2s *i2s, int width)
+static int sun8i_i2s_get_sr_wss(unsigned int width)
{
- if (width % 4)
- return -EINVAL;
-
- if (width < 8 || width > 32)
- return -EINVAL;
+ switch (width) {
+ case 8:
+ return 0x1;
+ case 12:
+ return 0x2;
+ case 16:
+ return 0x3;
+ case 20:
+ return 0x4;
+ case 24:
+ return 0x5;
+ case 28:
+ return 0x6;
+ case 32:
+ return 0x7;
+ }
- return (width - 8) / 4 + 1;
+ return -EINVAL;
}
static int sun4i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s,
@@ -572,11 +591,11 @@ static int sun4i_i2s_hw_params(struct snd_pcm_substream *substream,
}
i2s->playback_dma_data.addr_width = width;
- sr = i2s->variant->get_sr(i2s, word_size);
+ sr = i2s->variant->get_sr(word_size);
if (sr < 0)
return -EINVAL;
- wss = i2s->variant->get_wss(i2s, slot_width);
+ wss = i2s->variant->get_wss(slot_width);
if (wss < 0)
return -EINVAL;
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-09-21 10:27 UTC|newest]
Thread overview: 117+ 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 ` Clément Péron
2020-09-21 10:27 ` 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
2020-09-21 10:27 ` Clément Péron
2020-09-21 10:27 ` [PATCH v4 02/22] ASoC: sun4i-i2s: Change set_chan_cfg() params Clément Péron
2020-09-21 10:27 ` Clément Péron
2020-09-21 10:27 ` Clément Péron
2020-09-21 12:29 ` Maxime Ripard
2020-09-21 12:29 ` Maxime Ripard
2020-09-21 12:29 ` Maxime Ripard
2020-09-21 17:15 ` Clément Péron
2020-09-21 17:15 ` Clément Péron
2020-09-21 17:15 ` Clément Péron
2020-09-21 18:23 ` Mark Brown
2020-09-21 18:23 ` Mark Brown
2020-09-21 18:23 ` Mark Brown
2020-09-28 8:55 ` Maxime Ripard
2020-09-28 8:55 ` Maxime Ripard
2020-09-28 8:55 ` Maxime Ripard
2020-09-21 10:27 ` Clément Péron [this message]
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 10:27 ` Clément Péron
2020-09-21 13:55 ` Maxime Ripard
2020-09-21 13:55 ` Maxime Ripard
2020-09-21 13:55 ` Maxime Ripard
2020-09-21 17:22 ` Clément Péron
2020-09-21 17:22 ` Clément Péron
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 ` Clément Péron
2020-09-21 10:27 ` 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 ` Clément Péron
2020-09-21 10:27 ` 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 ` Clément Péron
2020-09-21 10:27 ` 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 ` Clément Péron
2020-09-21 10:27 ` 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 ` Clément Péron
2020-09-21 10:27 ` 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 10:27 ` Clément Péron
2020-09-21 10:27 ` Clément Péron
2020-09-21 13:59 ` Maxime Ripard
2020-09-21 13:59 ` Maxime Ripard
2020-09-21 13:59 ` Maxime Ripard
2020-09-21 17:23 ` Clément Péron
2020-09-21 17:23 ` Clément Péron
2020-09-21 17:23 ` Clément Péron
2020-09-21 18:37 ` Jernej Škrabec
2020-09-21 18:37 ` Jernej Škrabec
2020-09-21 18:37 ` Jernej Škrabec
2020-09-28 8:43 ` Maxime Ripard
2020-09-28 8:43 ` Maxime Ripard
2020-09-28 8:43 ` Maxime Ripard
2020-09-28 14:27 ` Clément Péron
2020-09-28 14:27 ` Clément Péron
2020-09-28 14:27 ` Clément Péron
2020-09-30 10:19 ` Maxime Ripard
2020-09-30 10:19 ` Maxime Ripard
2020-09-30 10:19 ` Maxime Ripard
2020-11-01 15:27 ` Clément Péron
2020-11-01 15:27 ` Clément Péron
2020-11-01 15:27 ` Clément Péron
2020-11-02 10:21 ` Maxime Ripard
2020-11-02 10:21 ` Maxime Ripard
2020-11-02 10:21 ` Maxime Ripard
2020-11-02 11:19 ` Clément Péron
2020-11-02 11:19 ` Clément Péron
2020-11-02 11:19 ` Clément Péron
2020-09-21 18:29 ` Mark Brown
2020-09-21 18:29 ` Mark Brown
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 ` Clément Péron
2020-09-21 10:27 ` 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 ` Clément Péron
2020-09-21 10:27 ` 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 ` Clément Péron
2020-09-21 10:27 ` 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 ` Clément Péron
2020-09-21 10:27 ` 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 ` Clément Péron
2020-09-21 10:27 ` 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 ` Clément Péron
2020-09-21 10:27 ` 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 ` Clément Péron
2020-09-21 10:27 ` 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 ` Clément Péron
2020-09-21 10:27 ` 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 ` Clément Péron
2020-09-21 10:27 ` 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 ` Clément Péron
2020-09-21 10:27 ` 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 ` Clément Péron
2020-09-21 10:27 ` 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 ` Clément Péron
2020-09-21 10:27 ` 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
2020-09-21 10:27 ` Clément Péron
2020-09-21 10:27 ` 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-4-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=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 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.