Re: [PATCH] ASoC: rsnd: fix DALIGN register for SSIU

[Kuninori Morimoto]

Hi Eugeniu

Thank you for your patch.

> From: Nilkanth Ahirrao <anilkanth@xxxxxxxxxxxxxx>
> 
> 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@xxxxxxxxxxx>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@xxxxxxxxxxx>
> Cc: Jiada Wang <jiada_wang@xxxxxxxxxx>
> Cc: Andrew Gabbasov <andrew_gabbasov@xxxxxxxxxx>
> Fixes: a914e44693d41b ("ASoC: rsnd: more clear rsnd_get_dalign() for DALIGN")
> Signed-off-by: Nilkanth Ahirrao <anilkanth@xxxxxxxxxxxxxx>
> [erosca: Adjust Fixes: tag, reformat patch description]
> Signed-off-by: Eugeniu Rosca <erosca@xxxxxxxxxxxxxx>
> ---
>  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