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

ASoC: rsnd: tidyup SRC position on each code 



This is cleanup for CTU/MIX support

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 5cbbadd3

sound/soc/sh/rcar/Makefile

+1 −1
Original line number Diff line number Diff line 
snd-soc-rcar-objs	:= core.o gen.o dma.o src.o adg.o ssi.o dvc.o

snd-soc-rcar-objs	:= core.o gen.o dma.o adg.o ssi.o src.o dvc.o

obj-$(CONFIG_SND_SOC_RCAR)	+= snd-soc-rcar.o



snd-soc-rsrc-card-objs	:= rsrc-card.o

sound/soc/sh/rcar/core.c

+4 −4
Original line number Diff line number Diff line
@@ -641,13 +641,13 @@ static int rsnd_path_init(struct rsnd_priv *priv, 
	 * using fixed path.

	 */



	/* SRC */

	ret = rsnd_path_add(priv, io, src);

	/* SSI */

	ret = rsnd_path_add(priv, io, ssi);

	if (ret < 0)

		return ret;



	/* SSI */

	ret = rsnd_path_add(priv, io, ssi);

	/* SRC */

	ret = rsnd_path_add(priv, io, src);

	if (ret < 0)

		return ret;

sound/soc/sh/rcar/rsnd.h

+19 −19
Original line number Diff line number Diff line
@@ -440,12 +440,6 @@ struct rsnd_priv { 
	 */

	void *gen;



	/*

	 * below value will be filled on rsnd_src_probe()

	 */

	void *src;

	int src_nr;



	/*

	 * below value will be filled on rsnd_adg_probe()

	 */
@@ -462,6 +456,12 @@ struct rsnd_priv { 
	void *ssi;

	int ssi_nr;



	/*

	 * below value will be filled on rsnd_src_probe()

	 */

	void *src;

	int src_nr;



	/*

	 * below value will be filled on rsnd_dvc_probe()

	 */
@@ -534,6 +534,19 @@ int rsnd_kctrl_new_e(struct rsnd_mod *mod, 
		     const char * const *texts,

		     u32 max);



/*

 *	R-Car SSI

 */

int rsnd_ssi_probe(struct platform_device *pdev,

		   const struct rsnd_of_data *of_data,

		   struct rsnd_priv *priv);

void rsnd_ssi_remove(struct platform_device *pdev,

		     struct rsnd_priv *priv);

struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id);

int rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod);

int rsnd_ssi_is_dma_mode(struct rsnd_mod *mod);

int rsnd_ssi_use_busif(struct rsnd_dai_stream *io, struct rsnd_mod *mod);



/*

 *	R-Car SRC

 */
@@ -554,19 +567,6 @@ int rsnd_src_ssiu_stop(struct rsnd_mod *ssi_mod, 
int rsnd_src_ssi_irq_enable(struct rsnd_mod *ssi_mod);

int rsnd_src_ssi_irq_disable(struct rsnd_mod *ssi_mod);



/*

 *	R-Car SSI

 */

int rsnd_ssi_probe(struct platform_device *pdev,

		   const struct rsnd_of_data *of_data,

		   struct rsnd_priv *priv);

void rsnd_ssi_remove(struct platform_device *pdev,

		     struct rsnd_priv *priv);

struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id);

int rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod);

int rsnd_ssi_is_dma_mode(struct rsnd_mod *mod);

int rsnd_ssi_use_busif(struct rsnd_dai_stream *io, struct rsnd_mod *mod);



/*

 *	R-Car DVC

 */