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

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

ASoC: rsnd: tidyup ADINR function name 



Renesas sound IP (= SSIU/SRC/CTU/MIX/DVC) have ADINR
(= Audio Information Register), but some of them (= SSIU/SRC/DVC)
are for audio data bits, some of them (= CTU/MIX) are for audio data
channels.
Current rsnd driver is supporting SSIU/SRC/DVC, and these ADINR were
for bits. This patch rename rsnd_get_adinr() to rsnd_get_adinr_bit(),
and we will have rsnd_get_adinr_chan() for CTU/MIX.

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 d1ade514

sound/soc/sh/rcar/core.c

+2 −2
Original line number Diff line number Diff line
@@ -203,9 +203,9 @@ int rsnd_io_is_working(struct rsnd_dai_stream *io) 
}



/*

 *	settting function

 *	ADINR function

 */

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

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

{

	struct rsnd_priv *priv = rsnd_mod_to_priv(mod);

	struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);

sound/soc/sh/rcar/dvc.c

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


	rsnd_path_parse(priv, io);



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

	rsnd_mod_write(mod, DVC_ADINR, rsnd_get_adinr_bit(mod, io));



	/* ch0/ch1 Volume */

	rsnd_dvc_volume_update(io, mod);

sound/soc/sh/rcar/rsnd.h

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ void rsnd_force_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, struct rsnd_dai_stream *io);

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

void rsnd_path_parse(struct rsnd_priv *priv,

		     struct rsnd_dai_stream *io);

sound/soc/sh/rcar/src.c

+2 −2
Original line number Diff line number Diff line
@@ -189,7 +189,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, io));

			       rsnd_get_adinr_bit(ssi_mod, io));

		rsnd_mod_write(ssi_mod, SSI_BUSIF_MODE,  1);

		rsnd_mod_write(ssi_mod, SSI_CTRL, 0x1);
@@ -309,7 +309,7 @@ static int rsnd_src_set_convert_rate(struct rsnd_mod *mod, 
		fsrate = 0x0400000 / convert_rate * runtime->rate;



	/* Set channel number and output bit length */

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

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



	/* Enable the initial value of IFS */

	if (fsrate) {