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

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

ASoC: rsnd: rsnd_ssi_is_multi_slave() macro uses rsnd_ssi_multi_slaves() 



b4c83b17 ("ASoC: rsnd: add Multi channel support") added
Multi channel support, and current rsnd_ssi_is_multi_slave()'s check
method is !SSI equals SSIM1/2/3. But, SSI parent also hit to this macro.
Because of this reason, some stream which needs SSI parent clock
can't work correctly. This patch uses rsnd_ssi_multi_slaves() to
solve this issue. This issue was reported by Dung.

Reported-by: default avatarNguyen Viet Dung <nv-dung@jinso.co.jp>
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b5b442ab

sound/soc/sh/rcar/ssi.c

+2 −14
Original line number Diff line number Diff line
@@ -94,7 +94,8 @@ struct rsnd_ssi { 
#define rsnd_mod_to_ssi(_mod) container_of((_mod), struct rsnd_ssi, mod)

#define rsnd_ssi_mode_flags(p) ((p)->flags)

#define rsnd_ssi_is_parent(ssi, io) ((ssi) == rsnd_io_to_mod_ssip(io))

#define rsnd_ssi_is_multi_slave(ssi, io) ((mod) != rsnd_io_to_mod_ssi(io))

#define rsnd_ssi_is_multi_slave(mod, io) \

	(rsnd_ssi_multi_slaves(io) & (1 << rsnd_mod_id(mod)))



int rsnd_ssi_use_busif(struct rsnd_dai_stream *io)

{
@@ -167,9 +168,6 @@ static int rsnd_ssi_irq(struct rsnd_mod *mod, 
u32 rsnd_ssi_multi_slaves(struct rsnd_dai_stream *io)

{

	struct rsnd_mod *mod;

	struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);

	struct rsnd_priv *priv = rsnd_io_to_priv(io);

	struct device *dev = rsnd_priv_to_dev(priv);

	enum rsnd_mod_type types[] = {

		RSND_MOD_SSIM1,

		RSND_MOD_SSIM2,
@@ -177,16 +175,6 @@ u32 rsnd_ssi_multi_slaves(struct rsnd_dai_stream *io) 
	};

	int i, mask;



	switch (runtime->channels) {

	case 2: /* Multi channel is not needed for Stereo */

		return 0;

	case 6:

		break;

	default:

		dev_err(dev, "unsupported channel\n");

		return 0;

	}



	mask = 0;

	for (i = 0; i < ARRAY_SIZE(types); i++) {

		mod = rsnd_io_to_mod(io, types[i]);