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

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

ASoC: rsnd: move CMD related operation to cmd.c 



8cca6e11c1 ("ASoC: rsnd: use mod base common method on CMD")
added cmd.c. Let's move CMD related operation to cmd.c

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

sound/soc/sh/rcar/cmd.c

+20 −0
Original line number Diff line number Diff line
@@ -81,14 +81,34 @@ static int rsnd_cmd_init(struct rsnd_mod *mod, 


	rsnd_mod_write(mod, CMD_ROUTE_SLCT, data);



	rsnd_adg_set_cmd_timsel_gen2(mod, io);



	return 0;

}



static int rsnd_cmd_start(struct rsnd_mod *mod,

			  struct rsnd_dai_stream *io,

			  struct rsnd_priv *priv)

{

	rsnd_mod_write(mod, CMD_CTRL, 0x10);



	return 0;

}



static int rsnd_cmd_stop(struct rsnd_mod *mod,

			 struct rsnd_dai_stream *io,

			 struct rsnd_priv *priv)

{

	rsnd_mod_write(mod, CMD_CTRL, 0);



	return 0;

}



static struct rsnd_mod_ops rsnd_cmd_ops = {

	.name	= CMD_NAME,

	.init	= rsnd_cmd_init,

	.start	= rsnd_cmd_start,

	.stop	= rsnd_cmd_stop,

};



int rsnd_cmd_attach(struct rsnd_dai_stream *io, int id)

sound/soc/sh/rcar/dvc.c

+1 −23
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static int rsnd_dvc_init(struct rsnd_mod *mod, 
	/* ch0/ch1 Volume */

	rsnd_dvc_volume_update(io, mod);



	rsnd_adg_set_cmd_timsel_gen2(mod, io);

	rsnd_dvc_initialize_unlock(mod);



	return 0;

}
@@ -185,26 +185,6 @@ static int rsnd_dvc_quit(struct rsnd_mod *mod, 
	return 0;

}



static int rsnd_dvc_start(struct rsnd_mod *mod,

			  struct rsnd_dai_stream *io,

			  struct rsnd_priv *priv)

{

	rsnd_dvc_initialize_unlock(mod);



	rsnd_mod_write(mod, CMD_CTRL, 0x10);



	return 0;

}



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);



	return 0;

}



static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,

			    struct rsnd_dai_stream *io,

			    struct snd_soc_pcm_runtime *rtd)
@@ -278,8 +258,6 @@ static struct rsnd_mod_ops rsnd_dvc_ops = { 
	.remove		= rsnd_dvc_remove_,

	.init		= rsnd_dvc_init,

	.quit		= rsnd_dvc_quit,

	.start		= rsnd_dvc_start,

	.stop		= rsnd_dvc_stop,

	.pcm_new	= rsnd_dvc_pcm_new,

};