[PATCH] ASoC: sun4i-i2s: Incorrect SR and WSS computation

[codek...@gmail.com]

From: Marcus Cooper <codek...@gmail.com>

The A64 audio codec uses the original I2S block but the SR and
WSS computation currently assigned is for the newer block.

Fixes: 619c15f7fac9 (ASoC: sun4i-i2s: Change SR and WSS computation)
Signed-off-by: Marcus Cooper <codek...@gmail.com>
---
sound/soc/sunxi/sun4i-i2s.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index 9b2232908b65..7fa5c61169db 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -1002,8 +1002,8 @@ static const struct sun4i_i2s_quirks sun50i_a64_codec_i2s_quirks = {
.field_rxchanmap = REG_FIELD(SUN4I_I2S_RX_CHAN_MAP_REG, 0, 31),
.field_txchansel = REG_FIELD(SUN4I_I2S_TX_CHAN_SEL_REG, 0, 2),
.field_rxchansel = REG_FIELD(SUN4I_I2S_RX_CHAN_SEL_REG, 0, 2),
- .get_sr = sun8i_i2s_get_sr_wss,
- .get_wss = sun8i_i2s_get_sr_wss,
+ .get_sr = sun4i_i2s_get_sr,
+ .get_wss = sun4i_i2s_get_wss,
};

static int sun4i_i2s_init_regmap_fields(struct device *dev,
--
2.22.0

[Vasily Khoruzhick]

On Mon, Jul 29, 2019 at 8:21 AM <codek...@gmail.com> wrote:
>
> From: Marcus Cooper <codek...@gmail.com>
>
> The A64 audio codec uses the original I2S block but the SR and
> WSS computation currently assigned is for the newer block.
>
> Fixes: 619c15f7fac9 (ASoC: sun4i-i2s: Change SR and WSS computation)

Looks like we need this fix for 5.3.

> Signed-off-by: Marcus Cooper <codek...@gmail.com>

Reviewed-by: Vasily Khoruzhick <anar...@gmail.com>

> ---
> sound/soc/sunxi/sun4i-i2s.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
> index 9b2232908b65..7fa5c61169db 100644
> --- a/sound/soc/sunxi/sun4i-i2s.c
> +++ b/sound/soc/sunxi/sun4i-i2s.c
> @@ -1002,8 +1002,8 @@ static const struct sun4i_i2s_quirks sun50i_a64_codec_i2s_quirks = {
> .field_rxchanmap = REG_FIELD(SUN4I_I2S_RX_CHAN_MAP_REG, 0, 31),
> .field_txchansel = REG_FIELD(SUN4I_I2S_TX_CHAN_SEL_REG, 0, 2),
> .field_rxchansel = REG_FIELD(SUN4I_I2S_RX_CHAN_SEL_REG, 0, 2),
> - .get_sr = sun8i_i2s_get_sr_wss,
> - .get_wss = sun8i_i2s_get_sr_wss,
> + .get_sr = sun4i_i2s_get_sr,
> + .get_wss = sun4i_i2s_get_wss,
> };
>
> static int sun4i_i2s_init_regmap_fields(struct device *dev,
> --
> 2.22.0
>

> --
> You received this message because you are subscribed to the Google Groups "linux-sunxi" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi...@googlegroups.com.
> To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20190729152130.27955-1-codekipper%40gmail.com.

[Maxime Ripard]

On Mon, Jul 29, 2019 at 05:21:30PM +0200, codek...@gmail.com wrote:
> From: Marcus Cooper <codek...@gmail.com>
>
> The A64 audio codec uses the original I2S block but the SR and
> WSS computation currently assigned is for the newer block.
>
> Fixes: 619c15f7fac9 (ASoC: sun4i-i2s: Change SR and WSS computation)
> Signed-off-by: Marcus Cooper <codek...@gmail.com>

Acked-by: Maxime Ripard <maxime...@bootlin.com>

Thanks!
Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com