ASoC: rsnd: fix DALIGN register for SSIU
diff mbox series

Message ID 20191118140126.23596-1-erosca@de.adit-jv.com
State New
Headers show
Series
  • ASoC: rsnd: fix DALIGN register for SSIU
Related show

Commit Message

Eugeniu Rosca Nov. 18, 2019, 2:01 p.m. UTC
From: Nilkanth Ahirrao <anilkanth@jp.adit-jv.com>

The current driver only sets 0x76543210 and 0x67452301 for DALIGN.
This doesn’t work well for TDM split and ex-split mode for all SSIU.
This patch programs the DALIGN registers based on the SSIU number.

Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
Cc: Jiada Wang <jiada_wang@mentor.com>
Cc: Andrew Gabbasov <andrew_gabbasov@mentor.com>
Fixes: a914e44693d41b ("ASoC: rsnd: more clear rsnd_get_dalign() for DALIGN")
Signed-off-by: Nilkanth Ahirrao <anilkanth@jp.adit-jv.com>
[erosca: Adjust Fixes: tag, reformat patch description]
Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
---
 sound/soc/sh/rcar/core.c | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

Comments

Kuninori Morimoto Nov. 19, 2019, 12:46 a.m. UTC | #1
Hi Eugeniu

Thank you for your patch.

> From: Nilkanth Ahirrao <anilkanth@jp.adit-jv.com>
> 
> The current driver only sets 0x76543210 and 0x67452301 for DALIGN.
> This doesn’t work well for TDM split and ex-split mode for all SSIU.
> This patch programs the DALIGN registers based on the SSIU number.
> 
> Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
> Cc: Jiada Wang <jiada_wang@mentor.com>
> Cc: Andrew Gabbasov <andrew_gabbasov@mentor.com>
> Fixes: a914e44693d41b ("ASoC: rsnd: more clear rsnd_get_dalign() for DALIGN")
> Signed-off-by: Nilkanth Ahirrao <anilkanth@jp.adit-jv.com>
> [erosca: Adjust Fixes: tag, reformat patch description]
> Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
> ---
>  sound/soc/sh/rcar/core.c | 25 +++++++++++++++++++++----
>  1 file changed, 21 insertions(+), 4 deletions(-)
> 
> diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
> index e9596c2096cd..ae05ed08a2b3 100644
> --- a/sound/soc/sh/rcar/core.c
> +++ b/sound/soc/sh/rcar/core.c
> @@ -376,6 +376,16 @@ u32 rsnd_get_adinr_bit(struct rsnd_mod *mod, struct rsnd_dai_stream *io)
>   */
>  u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io)
>  {
> +	static const u32 dalign_values[8][2] = {
> +		{0x76543210, 0x67452301},
> +		{0x00000032, 0x00000023},
> +		{0x00007654, 0x00006745},
> +		{0x00000076, 0x00000067},
> +		{0xfedcba98, 0xefcdab89},
> +		{0x000000ba, 0x000000ab},
> +		{0x0000fedc, 0x0000efcd},
> +		{0x000000fe, 0x000000ef},
> +	};
>  	struct rsnd_mod *ssiu = rsnd_io_to_mod_ssiu(io);
>  	struct rsnd_mod *target;
>  	struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
> @@ -413,11 +423,18 @@ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io)
>  
>  	/* Non target mod or non 16bit needs normal DALIGN */
>  	if ((snd_pcm_format_width(runtime->format) != 16) ||
> -	    (mod != target))
> -		return 0x76543210;
> +	    (mod != target)) {
> +		if (mod == ssiu)
> +			return dalign_values[rsnd_mod_id_sub(mod)][0];
> +		else
> +			return 0x76543210;
>  	/* Target mod needs inverted DALIGN when 16bit */
> -	else
> -		return 0x67452301;
> +	} else {
> +		if (mod == ssiu)
> +			return dalign_values[rsnd_mod_id_sub(mod)][1];
> +		else
> +			return 0x67452301;
> +	}
>  }

Basically I have no objection.
But we can reuse dalign_values[0][x] value ?

	id  = 0;
	if ((snd_pcm_format_width(runtime->format) != 16) ||
	    (mod != target)) {
		inv = 0;
		if (mod == ssiu))
			id = rsnd_mod_id_sub(mod);
	/* Target mod needs inverted DALIGN when 16bit */
	} else {
		inv = 1;
		if (mod == ssiu)
			id = rsnd_mod_id_sub(mod);
	}

	return dalign_values[id][inv];

Thank you for your help !!
Best regards
---
Kuninori Morimoto
Eugeniu Rosca Nov. 19, 2019, 10:43 a.m. UTC | #2
Hello Morimoto-san,

On Tue, Nov 19, 2019 at 09:46:12AM +0900, Kuninori Morimoto wrote:

[..]

> Basically I have no objection.
> But we can reuse dalign_values[0][x] value ?
> 
> 	id  = 0;
> 	if ((snd_pcm_format_width(runtime->format) != 16) ||
> 	    (mod != target)) {
> 		inv = 0;
> 		if (mod == ssiu))
> 			id = rsnd_mod_id_sub(mod);
> 	/* Target mod needs inverted DALIGN when 16bit */
> 	} else {
> 		inv = 1;
> 		if (mod == ssiu)
> 			id = rsnd_mod_id_sub(mod);
> 	}
> 
> 	return dalign_values[id][inv];

Thank you for your review comment.
We will soon push a v2.
Eugeniu Rosca Nov. 21, 2019, 11:18 a.m. UTC | #3
Superseded by v2:
https://lore.kernel.org/alsa-devel/20191121111023.10976-1-erosca@de.adit-jv.com/

Patch
diff mbox series

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index e9596c2096cd..ae05ed08a2b3 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -376,6 +376,16 @@  u32 rsnd_get_adinr_bit(struct rsnd_mod *mod, struct rsnd_dai_stream *io)
  */
 u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io)
 {
+	static const u32 dalign_values[8][2] = {
+		{0x76543210, 0x67452301},
+		{0x00000032, 0x00000023},
+		{0x00007654, 0x00006745},
+		{0x00000076, 0x00000067},
+		{0xfedcba98, 0xefcdab89},
+		{0x000000ba, 0x000000ab},
+		{0x0000fedc, 0x0000efcd},
+		{0x000000fe, 0x000000ef},
+	};
 	struct rsnd_mod *ssiu = rsnd_io_to_mod_ssiu(io);
 	struct rsnd_mod *target;
 	struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
@@ -413,11 +423,18 @@  u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io)
 
 	/* Non target mod or non 16bit needs normal DALIGN */
 	if ((snd_pcm_format_width(runtime->format) != 16) ||
-	    (mod != target))
-		return 0x76543210;
+	    (mod != target)) {
+		if (mod == ssiu)
+			return dalign_values[rsnd_mod_id_sub(mod)][0];
+		else
+			return 0x76543210;
 	/* Target mod needs inverted DALIGN when 16bit */
-	else
-		return 0x67452301;
+	} else {
+		if (mod == ssiu)
+			return dalign_values[rsnd_mod_id_sub(mod)][1];
+		else
+			return 0x67452301;
+	}
 }
 
 u32 rsnd_get_busif_shift(struct rsnd_dai_stream *io, struct rsnd_mod *mod)