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

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

ASoC: rsnd: judge work SSI in runtime 



Current rsnd supports multi SSI (maximum 4 SSI for 8ch),
and, it should determine whether using each SSI or not in runtime.
All SSIs are not used even if there are 4 SSI in case of stereo.

Current driver setups un-used SSI in such case. It is no problem,
but not needed. This patch judges it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4f5c634d

sound/soc/sh/rcar/ssi.c

+27 −0
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ struct rsnd_ssi { 
#define rsnd_ssi_is_parent(ssi, io) ((ssi) == rsnd_io_to_mod_ssip(io))

#define rsnd_ssi_is_multi_slave(mod, io) \

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

#define rsnd_ssi_is_run_mods(mod, io) \

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



int rsnd_ssi_use_busif(struct rsnd_dai_stream *io)

{
@@ -166,6 +168,16 @@ static u32 rsnd_ssi_multi_slaves(struct rsnd_dai_stream *io) 
	return mask;

}



static u32 rsnd_ssi_run_mods(struct rsnd_dai_stream *io)

{

	struct rsnd_mod *ssi_mod = rsnd_io_to_mod_ssi(io);

	struct rsnd_mod *ssi_parent_mod = rsnd_io_to_mod_ssip(io);



	return rsnd_ssi_multi_slaves_runtime(io) |

		1 << rsnd_mod_id(ssi_mod) |

		1 << rsnd_mod_id(ssi_parent_mod);

}



u32 rsnd_ssi_multi_slaves_runtime(struct rsnd_dai_stream *io)

{

	struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
@@ -348,6 +360,9 @@ static int rsnd_ssi_init(struct rsnd_mod *mod, 
	struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);

	int ret;



	if (!rsnd_ssi_is_run_mods(mod, io))

		return 0;



	ssi->usrcnt++;



	rsnd_mod_power_on(mod);
@@ -374,6 +389,9 @@ static int rsnd_ssi_quit(struct rsnd_mod *mod, 
	struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);

	struct device *dev = rsnd_priv_to_dev(priv);



	if (!rsnd_ssi_is_run_mods(mod, io))

		return 0;



	if (!ssi->usrcnt) {

		dev_err(dev, "%s[%d] usrcnt error\n",

			rsnd_mod_name(mod), rsnd_mod_id(mod));
@@ -422,6 +440,9 @@ static int rsnd_ssi_start(struct rsnd_mod *mod, 
			  struct rsnd_dai_stream *io,

			  struct rsnd_priv *priv)

{

	if (!rsnd_ssi_is_run_mods(mod, io))

		return 0;



	/*

	 * EN will be set via SSIU :: SSI_CONTROL

	 * if Multi channel mode
@@ -441,6 +462,9 @@ static int rsnd_ssi_stop(struct rsnd_mod *mod, 
	struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);

	u32 cr;



	if (!rsnd_ssi_is_run_mods(mod, io))

		return 0;



	/*

	 * don't stop if not last user

	 * see also
@@ -483,6 +507,9 @@ static int rsnd_ssi_irq(struct rsnd_mod *mod, 
	if (rsnd_ssi_is_parent(mod, io))

		return 0;



	if (!rsnd_ssi_is_run_mods(mod, io))

		return 0;



	if (enable)

		val = rsnd_ssi_is_dma_mode(mod) ? 0x0e000000 : 0x0f000000;