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

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

ASoC: rsnd: adds struct rsnd_dai_stream as on each fuction as parameter 



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 means we can't call rsnd_mod_to_io() any more.
This patch adds struct rsnd_dai_stream to each function as parameter.

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 2099bc8e

sound/soc/sh/rcar/core.c

+5 −5
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ u32 rsnd_get_adinr(struct rsnd_mod *mod) 
/*

 *	rsnd_dai functions

 */

#define __rsnd_mod_call(mod, func, param...)			\

#define __rsnd_mod_call(mod, io, func, param...)		\

({								\

	struct rsnd_priv *priv = rsnd_mod_to_priv(mod);		\

	struct device *dev = rsnd_priv_to_dev(priv);		\
@@ -220,7 +220,7 @@ u32 rsnd_get_adinr(struct rsnd_mod *mod) 
	int called = 0;							\

	if (val == __rsnd_mod_call_##func) {				\

		called = 1;						\

		ret = (mod)->ops->func(mod, param);			\

		ret = (mod)->ops->func(mod, io, param);			\

		mod->status = (mod->status & ~mask) +			\

			(add << __rsnd_mod_shift_##func);		\

	}								\
@@ -230,10 +230,10 @@ u32 rsnd_get_adinr(struct rsnd_mod *mod) 
	ret;								\

})



#define rsnd_mod_call(mod, func, param...)	\

#define rsnd_mod_call(mod, io, func, param...)	\

	(!(mod) ? -ENODEV :			\

	 !((mod)->ops->func) ? 0 :		\

	 __rsnd_mod_call(mod, func, param))

	 __rsnd_mod_call(mod, io, func, param))



#define rsnd_dai_call(fn, io, param...)				\

({								\
@@ -243,7 +243,7 @@ u32 rsnd_get_adinr(struct rsnd_mod *mod) 
		mod = (io)->mod[i];				\

		if (!mod)					\

			continue;				\

		ret = rsnd_mod_call(mod, fn, param);		\

		ret = rsnd_mod_call(mod, io, fn, param);	\

		if (ret < 0)					\

			break;					\

	}							\

sound/soc/sh/rcar/dvc.c

+6 −2
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ static void rsnd_dvc_volume_update(struct rsnd_mod *mod) 
}



static int rsnd_dvc_remove_gen2(struct rsnd_mod *mod,

				struct rsnd_dai_stream *io,

				struct rsnd_priv *priv)

{

	struct rsnd_dvc *dvc = rsnd_mod_to_dvc(mod);
@@ -134,9 +135,9 @@ static int rsnd_dvc_remove_gen2(struct rsnd_mod *mod, 
}



static int rsnd_dvc_init(struct rsnd_mod *dvc_mod,

			 struct rsnd_dai_stream *io,

			 struct rsnd_priv *priv)

{

	struct rsnd_dai_stream *io = rsnd_mod_to_io(dvc_mod);

	struct rsnd_mod *src_mod = rsnd_io_to_mod_src(io);

	struct device *dev = rsnd_priv_to_dev(priv);

	int dvc_id = rsnd_mod_id(dvc_mod);
@@ -181,6 +182,7 @@ static int rsnd_dvc_init(struct rsnd_mod *dvc_mod, 
}



static int rsnd_dvc_quit(struct rsnd_mod *mod,

			 struct rsnd_dai_stream *io,

			 struct rsnd_priv *priv)

{

	rsnd_mod_hw_stop(mod);
@@ -189,6 +191,7 @@ static int rsnd_dvc_quit(struct rsnd_mod *mod, 
}



static int rsnd_dvc_start(struct rsnd_mod *mod,

			  struct rsnd_dai_stream *io,

			  struct rsnd_priv *priv)

{

	rsnd_mod_write(mod, CMD_CTRL, 0x10);
@@ -197,6 +200,7 @@ static int rsnd_dvc_start(struct rsnd_mod *mod, 
}



static int rsnd_dvc_stop(struct rsnd_mod *mod,

			 struct rsnd_dai_stream *io,

			 struct rsnd_priv *priv)

{

	rsnd_mod_write(mod, CMD_CTRL, 0);
@@ -205,9 +209,9 @@ static int rsnd_dvc_stop(struct rsnd_mod *mod, 
}



static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,

			    struct rsnd_dai_stream *io,

			    struct snd_soc_pcm_runtime *rtd)

{

	struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);

	struct rsnd_dvc *dvc = rsnd_mod_to_dvc(mod);

	int is_play = rsnd_io_is_play(io);

	int ret;

sound/soc/sh/rcar/rsnd.h

+9 −0
Original line number Diff line number Diff line
@@ -226,23 +226,32 @@ struct rsnd_mod_ops { 
	char *name;

	struct dma_chan* (*dma_req)(struct rsnd_mod *mod);

	int (*probe)(struct rsnd_mod *mod,

		     struct rsnd_dai_stream *io,

		     struct rsnd_priv *priv);

	int (*remove)(struct rsnd_mod *mod,

		      struct rsnd_dai_stream *io,

		      struct rsnd_priv *priv);

	int (*init)(struct rsnd_mod *mod,

		    struct rsnd_dai_stream *io,

		    struct rsnd_priv *priv);

	int (*quit)(struct rsnd_mod *mod,

		    struct rsnd_dai_stream *io,

		    struct rsnd_priv *priv);

	int (*start)(struct rsnd_mod *mod,

		     struct rsnd_dai_stream *io,

		     struct rsnd_priv *priv);

	int (*stop)(struct rsnd_mod *mod,

		    struct rsnd_dai_stream *io,

		    struct rsnd_priv *priv);

	int (*pcm_new)(struct rsnd_mod *mod,

		       struct rsnd_dai_stream *io,

		       struct snd_soc_pcm_runtime *rtd);

	int (*hw_params)(struct rsnd_mod *mod,

			 struct rsnd_dai_stream *io,

			 struct snd_pcm_substream *substream,

			 struct snd_pcm_hw_params *hw_params);

	int (*fallback)(struct rsnd_mod *mod,

			struct rsnd_dai_stream *io,

			struct rsnd_priv *priv);

};

sound/soc/sh/rcar/src.c

+11 −1
Original line number Diff line number Diff line
@@ -316,6 +316,7 @@ static int rsnd_src_set_convert_rate(struct rsnd_mod *mod) 
}



static int rsnd_src_hw_params(struct rsnd_mod *mod,

			      struct rsnd_dai_stream *io,

			      struct snd_pcm_substream *substream,

			      struct snd_pcm_hw_params *fe_params)

{
@@ -372,6 +373,7 @@ static int rsnd_src_init(struct rsnd_mod *mod, 
}



static int rsnd_src_quit(struct rsnd_mod *mod,

			 struct rsnd_dai_stream *io,

			 struct rsnd_priv *priv)

{

	struct rsnd_src *src = rsnd_mod_to_src(mod);
@@ -532,6 +534,7 @@ static int rsnd_src_set_convert_rate_gen1(struct rsnd_mod *mod) 
}



static int rsnd_src_init_gen1(struct rsnd_mod *mod,

			      struct rsnd_dai_stream *io,

			      struct rsnd_priv *priv)

{

	int ret;
@@ -556,6 +559,7 @@ static int rsnd_src_init_gen1(struct rsnd_mod *mod, 
}



static int rsnd_src_start_gen1(struct rsnd_mod *mod,

			       struct rsnd_dai_stream *io,

			       struct rsnd_priv *priv)

{

	int id = rsnd_mod_id(mod);
@@ -566,6 +570,7 @@ static int rsnd_src_start_gen1(struct rsnd_mod *mod, 
}



static int rsnd_src_stop_gen1(struct rsnd_mod *mod,

			      struct rsnd_dai_stream *io,

			      struct rsnd_priv *priv)

{

	int id = rsnd_mod_id(mod);
@@ -781,6 +786,7 @@ static int rsnd_src_set_convert_timing_gen2(struct rsnd_mod *mod) 
}



static int rsnd_src_probe_gen2(struct rsnd_mod *mod,

			       struct rsnd_dai_stream *io,

			       struct rsnd_priv *priv)

{

	struct rsnd_src *src = rsnd_mod_to_src(mod);
@@ -810,6 +816,7 @@ static int rsnd_src_probe_gen2(struct rsnd_mod *mod, 
}



static int rsnd_src_remove_gen2(struct rsnd_mod *mod,

				struct rsnd_dai_stream *io,

				struct rsnd_priv *priv)

{

	rsnd_dma_quit(rsnd_mod_to_dma(mod));
@@ -818,6 +825,7 @@ static int rsnd_src_remove_gen2(struct rsnd_mod *mod, 
}



static int rsnd_src_init_gen2(struct rsnd_mod *mod,

			      struct rsnd_dai_stream *io,

			      struct rsnd_priv *priv)

{

	int ret;
@@ -838,6 +846,7 @@ static int rsnd_src_init_gen2(struct rsnd_mod *mod, 
}



static int rsnd_src_start_gen2(struct rsnd_mod *mod,

			       struct rsnd_dai_stream *io,

			       struct rsnd_priv *priv)

{

	rsnd_dma_start(rsnd_mod_to_dma(mod));
@@ -846,6 +855,7 @@ static int rsnd_src_start_gen2(struct rsnd_mod *mod, 
}



static int rsnd_src_stop_gen2(struct rsnd_mod *mod,

			      struct rsnd_dai_stream *io,

			      struct rsnd_priv *priv)

{

	int ret;
@@ -878,10 +888,10 @@ static void rsnd_src_reconvert_update(struct rsnd_mod *mod) 
}



static int rsnd_src_pcm_new(struct rsnd_mod *mod,

			    struct rsnd_dai_stream *io,

			    struct snd_soc_pcm_runtime *rtd)

{

	struct rsnd_priv *priv = rsnd_mod_to_priv(mod);

	struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);

	struct rsnd_dai *rdai = rsnd_io_to_rdai(io);

	struct rsnd_src *src = rsnd_mod_to_src(mod);

	int ret;

sound/soc/sh/rcar/ssi.c

+17 −7
Original line number Diff line number Diff line
@@ -281,10 +281,10 @@ static void rsnd_ssi_hw_stop(struct rsnd_ssi *ssi) 
 *	SSI mod common functions

 */

static int rsnd_ssi_init(struct rsnd_mod *mod,

			 struct rsnd_dai_stream *io,

			 struct rsnd_priv *priv)

{

	struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);

	struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);

	struct rsnd_dai *rdai = rsnd_io_to_rdai(io);

	struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);

	u32 cr;
@@ -332,6 +332,7 @@ static int rsnd_ssi_init(struct rsnd_mod *mod, 
}



static int rsnd_ssi_quit(struct rsnd_mod *mod,

			 struct rsnd_dai_stream *io,

			 struct rsnd_priv *priv)

{

	struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
@@ -348,6 +349,7 @@ static int rsnd_ssi_quit(struct rsnd_mod *mod, 
}



static int rsnd_ssi_hw_params(struct rsnd_mod *mod,

			      struct rsnd_dai_stream *io,

			      struct snd_pcm_substream *substream,

			      struct snd_pcm_hw_params *params)

{
@@ -371,7 +373,8 @@ static int rsnd_ssi_hw_params(struct rsnd_mod *mod, 
	/* It will be removed on rsnd_ssi_hw_stop */

	ssi->chan = chan;

	if (ssi_parent)

		return rsnd_ssi_hw_params(&ssi_parent->mod, substream, params);

		return rsnd_ssi_hw_params(&ssi_parent->mod, io,

					  substream, params);



	return 0;

}
@@ -388,10 +391,10 @@ static void rsnd_ssi_record_error(struct rsnd_ssi *ssi, u32 status) 
}



static int rsnd_ssi_start(struct rsnd_mod *mod,

			  struct rsnd_dai_stream *io,

			  struct rsnd_priv *priv)

{

	struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);

	struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);



	rsnd_src_ssiu_start(mod, rsnd_ssi_use_busif(mod));
@@ -403,6 +406,7 @@ static int rsnd_ssi_start(struct rsnd_mod *mod, 
}



static int rsnd_ssi_stop(struct rsnd_mod *mod,

			 struct rsnd_dai_stream *io,

			 struct rsnd_priv *priv)

{

	struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
@@ -465,9 +469,9 @@ static irqreturn_t rsnd_ssi_interrupt(int irq, void *data) 
		dev_dbg(dev, "%s[%d] restart\n",

			rsnd_mod_name(mod), rsnd_mod_id(mod));



		rsnd_ssi_stop(mod, priv);

		rsnd_ssi_stop(mod, io, priv);

		if (ssi->err < 1024)

			rsnd_ssi_start(mod, priv);

			rsnd_ssi_start(mod, io, priv);

		else

			dev_warn(dev, "no more SSI restart\n");

	}
@@ -487,6 +491,7 @@ static irqreturn_t rsnd_ssi_interrupt(int irq, void *data) 
 *		SSI PIO

 */

static int rsnd_ssi_pio_probe(struct rsnd_mod *mod,

			      struct rsnd_dai_stream *io,

			      struct rsnd_priv *priv)

{

	struct device *dev = rsnd_priv_to_dev(priv);
@@ -512,6 +517,7 @@ static struct rsnd_mod_ops rsnd_ssi_pio_ops = { 
};



static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,

			      struct rsnd_dai_stream *io,

			      struct rsnd_priv *priv)

{

	struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
@@ -534,6 +540,7 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod, 
}



static int rsnd_ssi_dma_remove(struct rsnd_mod *mod,

			       struct rsnd_dai_stream *io,

			       struct rsnd_priv *priv)

{

	struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
@@ -549,6 +556,7 @@ static int rsnd_ssi_dma_remove(struct rsnd_mod *mod, 
}



static int rsnd_ssi_fallback(struct rsnd_mod *mod,

			     struct rsnd_dai_stream *io,

			     struct rsnd_priv *priv)

{

	struct device *dev = rsnd_priv_to_dev(priv);
@@ -569,23 +577,25 @@ static int rsnd_ssi_fallback(struct rsnd_mod *mod, 
}



static int rsnd_ssi_dma_start(struct rsnd_mod *mod,

			      struct rsnd_dai_stream *io,

			      struct rsnd_priv *priv)

{

	struct rsnd_dma *dma = rsnd_mod_to_dma(mod);



	rsnd_dma_start(dma);



	rsnd_ssi_start(mod, priv);

	rsnd_ssi_start(mod, io, priv);



	return 0;

}



static int rsnd_ssi_dma_stop(struct rsnd_mod *mod,

			     struct rsnd_dai_stream *io,

			     struct rsnd_priv *priv)

{

	struct rsnd_dma *dma = rsnd_mod_to_dma(mod);



	rsnd_ssi_stop(mod, priv);

	rsnd_ssi_stop(mod, io, priv);



	rsnd_dma_stop(dma);