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

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

ASoC: rsnd: don't use rsnd_mod_to_io() on rsnd_get_adinr() 



Each Renesas sound mod (= SSI/SRC/DVC) might be called from many paths
if it supports MIXer. In such case, mod <-> io is no longer 1:1
relationship. This patch removes rsnd_mod_to_io() from rsnd_get_adinr()
and its related function

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: default avatarKeita Kobayashi <keita.kobayashi.ym@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f501b7a4

sound/soc/sh/rcar/core.c

+1 −2
Original line number Diff line number Diff line
@@ -206,10 +206,9 @@ int rsnd_mod_is_working(struct rsnd_mod *mod) 
/*

 *	settting function

 */

u32 rsnd_get_adinr(struct rsnd_mod *mod)

u32 rsnd_get_adinr(struct rsnd_mod *mod, struct rsnd_dai_stream *io)

{

	struct rsnd_priv *priv = rsnd_mod_to_priv(mod);

	struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);

	struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);

	struct device *dev = rsnd_priv_to_dev(priv);

	u32 adinr = runtime->channels;

sound/soc/sh/rcar/dvc.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static int rsnd_dvc_init(struct rsnd_mod *dvc_mod, 


	rsnd_mod_write(dvc_mod, DVC_DVUIR, 1);



	rsnd_mod_write(dvc_mod, DVC_ADINR, rsnd_get_adinr(dvc_mod));

	rsnd_mod_write(dvc_mod, DVC_ADINR, rsnd_get_adinr(dvc_mod, io));



	/* ch0/ch1 Volume */

	rsnd_dvc_volume_update(dvc_mod);

sound/soc/sh/rcar/rsnd.h

+4 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ void rsnd_write(struct rsnd_priv *priv, struct rsnd_mod *mod, 
		enum rsnd_reg reg, u32 data);

void rsnd_bset(struct rsnd_priv *priv, struct rsnd_mod *mod, enum rsnd_reg reg,

		    u32 mask, u32 data);

u32 rsnd_get_adinr(struct rsnd_mod *mod);

u32 rsnd_get_adinr(struct rsnd_mod *mod, struct rsnd_dai_stream *io);



/*

 *	R-Car DMA
@@ -537,8 +537,10 @@ unsigned int rsnd_src_get_ssi_rate(struct rsnd_priv *priv, 
				   struct rsnd_dai_stream *io,

				   struct snd_pcm_runtime *runtime);

int rsnd_src_ssiu_start(struct rsnd_mod *ssi_mod,

			struct rsnd_dai_stream *io,

			int use_busif);

int rsnd_src_ssiu_stop(struct rsnd_mod *ssi_mod);

int rsnd_src_ssiu_stop(struct rsnd_mod *ssi_mod,

		       struct rsnd_dai_stream *io);

int rsnd_src_ssi_irq_enable(struct rsnd_mod *ssi_mod);

int rsnd_src_ssi_irq_disable(struct rsnd_mod *ssi_mod);

sound/soc/sh/rcar/src.c

+15 −13
Original line number Diff line number Diff line
@@ -129,9 +129,9 @@ static struct dma_chan *rsnd_src_dma_req(struct rsnd_mod *mod) 
}



int rsnd_src_ssiu_start(struct rsnd_mod *ssi_mod,

			struct rsnd_dai_stream *io,

			int use_busif)

{

	struct rsnd_dai_stream *io = rsnd_mod_to_io(ssi_mod);

	struct rsnd_dai *rdai = rsnd_io_to_rdai(io);

	struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);

	int ssi_id = rsnd_mod_id(ssi_mod);
@@ -174,7 +174,7 @@ int rsnd_src_ssiu_start(struct rsnd_mod *ssi_mod, 
		u32 mask = ~0;



		rsnd_mod_write(ssi_mod, SSI_BUSIF_ADINR,

			       rsnd_get_adinr(ssi_mod));

			       rsnd_get_adinr(ssi_mod, io));

		rsnd_mod_write(ssi_mod, SSI_BUSIF_MODE,  1);

		rsnd_mod_write(ssi_mod, SSI_CTRL, 0x1);
@@ -196,7 +196,8 @@ int rsnd_src_ssiu_start(struct rsnd_mod *ssi_mod, 
	return 0;

}



int rsnd_src_ssiu_stop(struct rsnd_mod *ssi_mod)

int rsnd_src_ssiu_stop(struct rsnd_mod *ssi_mod,

		       struct rsnd_dai_stream *io)

{

	/*

	 * DMA settings for SSIU
@@ -283,9 +284,9 @@ unsigned int rsnd_src_get_ssi_rate(struct rsnd_priv *priv, 
	return rate;

}



static int rsnd_src_set_convert_rate(struct rsnd_mod *mod)

static int rsnd_src_set_convert_rate(struct rsnd_mod *mod,

				     struct rsnd_dai_stream *io)

{

	struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);

	struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);

	struct rsnd_src *src = rsnd_mod_to_src(mod);

	u32 convert_rate = rsnd_src_convert_rate(src);
@@ -299,7 +300,7 @@ static int rsnd_src_set_convert_rate(struct rsnd_mod *mod) 
	rsnd_mod_write(mod, SRC_SWRSR, 1);



	/* Set channel number and output bit length */

	rsnd_mod_write(mod, SRC_ADINR, rsnd_get_adinr(mod));

	rsnd_mod_write(mod, SRC_ADINR, rsnd_get_adinr(mod, io));



	/* Enable the initial value of IFS */

	if (fsrate) {
@@ -508,12 +509,13 @@ static int rsnd_src_set_convert_timing_gen1(struct rsnd_mod *mod) 
	return 0;

}



static int rsnd_src_set_convert_rate_gen1(struct rsnd_mod *mod)

static int rsnd_src_set_convert_rate_gen1(struct rsnd_mod *mod,

					  struct rsnd_dai_stream *io)

{

	struct rsnd_src *src = rsnd_mod_to_src(mod);

	int ret;



	ret = rsnd_src_set_convert_rate(mod);

	ret = rsnd_src_set_convert_rate(mod, io);

	if (ret < 0)

		return ret;
@@ -547,7 +549,7 @@ static int rsnd_src_init_gen1(struct rsnd_mod *mod, 
	if (ret < 0)

		return ret;



	ret = rsnd_src_set_convert_rate_gen1(mod);

	ret = rsnd_src_set_convert_rate_gen1(mod, io);

	if (ret < 0)

		return ret;
@@ -706,11 +708,11 @@ static irqreturn_t rsnd_src_interrupt_gen2(int irq, void *data) 
	return IRQ_HANDLED;

}



static int rsnd_src_set_convert_rate_gen2(struct rsnd_mod *mod)

static int rsnd_src_set_convert_rate_gen2(struct rsnd_mod *mod,

					  struct rsnd_dai_stream *io)

{

	struct rsnd_priv *priv = rsnd_mod_to_priv(mod);

	struct device *dev = rsnd_priv_to_dev(priv);

	struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);

	struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);

	struct rsnd_src *src = rsnd_mod_to_src(mod);

	u32 convert_rate = rsnd_src_convert_rate(src);
@@ -731,7 +733,7 @@ static int rsnd_src_set_convert_rate_gen2(struct rsnd_mod *mod) 
		return -EINVAL;

	}



	ret = rsnd_src_set_convert_rate(mod);

	ret = rsnd_src_set_convert_rate(mod, io);

	if (ret < 0)

		return ret;
@@ -834,7 +836,7 @@ static int rsnd_src_init_gen2(struct rsnd_mod *mod, 
	if (ret < 0)

		return ret;



	ret = rsnd_src_set_convert_rate_gen2(mod);

	ret = rsnd_src_set_convert_rate_gen2(mod, io);

	if (ret < 0)

		return ret;

sound/soc/sh/rcar/ssi.c

+2 −2
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static int rsnd_ssi_start(struct rsnd_mod *mod, 
{

	struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);



	rsnd_src_ssiu_start(mod, rsnd_ssi_use_busif(mod));

	rsnd_src_ssiu_start(mod, io, rsnd_ssi_use_busif(mod));



	rsnd_ssi_hw_start(ssi, io);
@@ -417,7 +417,7 @@ static int rsnd_ssi_stop(struct rsnd_mod *mod, 


	rsnd_ssi_hw_stop(ssi);



	rsnd_src_ssiu_stop(mod);

	rsnd_src_ssiu_stop(mod, io);



	return 0;

}