Commit c140284b authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: rsnd: tidyup rsnd_get_slot_xxx() naming

rsnd_get_slot_rdai() returns total slots (it returns 6 if total 6
channels) , and rsnd_get_slot_extend() returns extended SSI width
(it returns 8 if total 6 channels). This will be used on SSI multi
channel support too (It will return 2 if total 6 channels with 3 SSI).
But, it is using confusable naming.
This patch changes rsnd_get_slot_rdai() -> rsnd_get_slot(),
rsnd_get_slot_extend() -> rsnd_get_slot_width()
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5858a7d1
...@@ -191,12 +191,14 @@ int rsnd_io_is_working(struct rsnd_dai_stream *io) ...@@ -191,12 +191,14 @@ int rsnd_io_is_working(struct rsnd_dai_stream *io)
return !!io->substream; return !!io->substream;
} }
int rsnd_get_slot_rdai(struct rsnd_dai *rdai) int rsnd_get_slot(struct rsnd_dai_stream *io)
{ {
struct rsnd_dai *rdai = rsnd_io_to_rdai(io);
return rdai->slots; return rdai->slots;
} }
int rsnd_get_slot_extend(struct rsnd_dai_stream *io) int rsnd_get_slot_width(struct rsnd_dai_stream *io)
{ {
struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io); struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
int chan = runtime->channels; int chan = runtime->channels;
......
...@@ -242,10 +242,9 @@ static int rsnd_dvc_pcm_new(struct rsnd_mod *mod, ...@@ -242,10 +242,9 @@ static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
struct rsnd_dai_stream *io, struct rsnd_dai_stream *io,
struct snd_soc_pcm_runtime *rtd) struct snd_soc_pcm_runtime *rtd)
{ {
struct rsnd_dai *rdai = rsnd_io_to_rdai(io);
struct rsnd_dvc *dvc = rsnd_mod_to_dvc(mod); struct rsnd_dvc *dvc = rsnd_mod_to_dvc(mod);
int is_play = rsnd_io_is_play(io); int is_play = rsnd_io_is_play(io);
int slots = rsnd_get_slot_rdai(rdai); int slots = rsnd_get_slot(io);
int ret; int ret;
/* Volume */ /* Volume */
......
...@@ -293,8 +293,8 @@ void rsnd_mod_interrupt(struct rsnd_mod *mod, ...@@ -293,8 +293,8 @@ void rsnd_mod_interrupt(struct rsnd_mod *mod,
void (*callback)(struct rsnd_mod *mod, void (*callback)(struct rsnd_mod *mod,
struct rsnd_dai_stream *io)); struct rsnd_dai_stream *io));
int rsnd_get_slot_rdai(struct rsnd_dai *rdai); int rsnd_get_slot(struct rsnd_dai_stream *io);
int rsnd_get_slot_extend(struct rsnd_dai_stream *io); int rsnd_get_slot_width(struct rsnd_dai_stream *io);
/* /*
* R-Car sound DAI * R-Car sound DAI
......
...@@ -180,7 +180,7 @@ static int rsnd_ssi_master_clk_start(struct rsnd_ssi *ssi, ...@@ -180,7 +180,7 @@ static int rsnd_ssi_master_clk_start(struct rsnd_ssi *ssi,
struct rsnd_dai *rdai = rsnd_io_to_rdai(io); struct rsnd_dai *rdai = rsnd_io_to_rdai(io);
struct rsnd_mod *mod = rsnd_mod_get(ssi); struct rsnd_mod *mod = rsnd_mod_get(ssi);
struct rsnd_mod *ssi_parent_mod = rsnd_io_to_mod_ssip(io); struct rsnd_mod *ssi_parent_mod = rsnd_io_to_mod_ssip(io);
int slots = rsnd_get_slot_extend(io); int slots = rsnd_get_slot_width(io);
int j, ret; int j, ret;
int ssi_clk_mul_table[] = { int ssi_clk_mul_table[] = {
1, 2, 4, 8, 16, 6, 12, 1, 2, 4, 8, 16, 6, 12,
...@@ -267,7 +267,7 @@ static int rsnd_ssi_config_init(struct rsnd_ssi *ssi, ...@@ -267,7 +267,7 @@ static int rsnd_ssi_config_init(struct rsnd_ssi *ssi,
u32 wsr; u32 wsr;
int is_tdm; int is_tdm;
is_tdm = (rsnd_get_slot_extend(io) >= 6) ? 1 : 0; is_tdm = (rsnd_get_slot_width(io) >= 6) ? 1 : 0;
/* /*
* always use 32bit system word. * always use 32bit system word.
......
...@@ -78,7 +78,7 @@ static int rsnd_ssiu_init_gen2(struct rsnd_mod *mod, ...@@ -78,7 +78,7 @@ static int rsnd_ssiu_init_gen2(struct rsnd_mod *mod,
if (ret < 0) if (ret < 0)
return ret; return ret;
if (rsnd_get_slot_extend(io) >= 6) { if (rsnd_get_slot_width(io) >= 6) {
/* /*
* TDM Extend Mode * TDM Extend Mode
* see * see
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment