Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ce2959d authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: rsnd: rsnd_get_dalign() needs to care SSIU, not SSI 



SSIU was controlled by SSI before, but
commit c7f69ab5("ASoC: rsnd: use mod base common method on SSIU")
separated it into ssiu.c

But, it didn't care about rsnd_get_dalign() for judging SSI_BUSIF_DALIGN
register value which changes the stream data order.
This function will be called from cmd/src/ssiu now, but current code
still cares ssi, not ssiu.
This patch fix it up

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: default avatarHiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4821d914

sound/soc/sh/rcar/core.c

+3 −3
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ 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)

{

	struct rsnd_mod *ssi = rsnd_io_to_mod_ssi(io);

	struct rsnd_mod *ssiu = rsnd_io_to_mod_ssiu(io);

	struct rsnd_mod *target;

	struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);

	u32 val = 0x76543210;
@@ -315,11 +315,11 @@ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io) 
	if (rsnd_io_is_play(io)) {

		struct rsnd_mod *src = rsnd_io_to_mod_src(io);



		target = src ? src : ssi;

		target = src ? src : ssiu;

	} else {

		struct rsnd_mod *cmd = rsnd_io_to_mod_cmd(io);



		target = cmd ? cmd : ssi;

		target = cmd ? cmd : ssiu;

	}



	mask <<= runtime->channels * 4;

sound/soc/sh/rcar/rsnd.h

+1 −0
Original line number Diff line number Diff line
@@ -428,6 +428,7 @@ struct rsnd_dai_stream { 
};

#define rsnd_io_to_mod(io, i)	((i) < RSND_MOD_MAX ? (io)->mod[(i)] : NULL)

#define rsnd_io_to_mod_ssi(io)	rsnd_io_to_mod((io), RSND_MOD_SSI)

#define rsnd_io_to_mod_ssiu(io)	rsnd_io_to_mod((io), RSND_MOD_SSIU)

#define rsnd_io_to_mod_ssip(io)	rsnd_io_to_mod((io), RSND_MOD_SSIP)

#define rsnd_io_to_mod_src(io)	rsnd_io_to_mod((io), RSND_MOD_SRC)

#define rsnd_io_to_mod_ctu(io)	rsnd_io_to_mod((io), RSND_MOD_CTU)