Skip to content

Commit

Permalink
ASoC: rsnd: modify rsnd_adg_ssi_ws_timing_gen2() parameter
Browse files Browse the repository at this point in the history
rsnd_adg_ssi_ws_timing_gen2() returns SSI WS timing,
and it used "mod" as parameter.
but, this "mod" is sometimes not ssi mod.
Get SSI mod from rsnd_dai_stream

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Mar 4, 2014
1 parent 685fb3e commit 8467ded
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions sound/soc/sh/rcar/adg.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ struct rsnd_adg {
#define rsnd_priv_to_adg(priv) ((struct rsnd_adg *)(priv)->adg)


static u32 rsnd_adg_ssi_ws_timing_gen2(struct rsnd_mod *mod)
static u32 rsnd_adg_ssi_ws_timing_gen2(struct rsnd_dai_stream *io)
{
struct rsnd_mod *mod = rsnd_io_to_mod_ssi(io);
struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
int id = rsnd_mod_id(mod);
int ws = id;
Expand Down Expand Up @@ -67,7 +68,7 @@ static int rsnd_adg_set_src_timsel_gen2(struct rsnd_dai *rdai,
u32 mask, ws;
u32 in, out;

ws = rsnd_adg_ssi_ws_timing_gen2(mod);
ws = rsnd_adg_ssi_ws_timing_gen2(io);

in = (is_play) ? timsel : ws;
out = (is_play) ? ws : timsel;
Expand Down Expand Up @@ -174,7 +175,7 @@ int rsnd_adg_set_convert_timing_gen2(struct rsnd_mod *mod,
struct rsnd_dai *rdai,
struct rsnd_dai_stream *io)
{
u32 val = rsnd_adg_ssi_ws_timing_gen2(mod);
u32 val = rsnd_adg_ssi_ws_timing_gen2(io);

return rsnd_adg_set_src_timsel_gen2(rdai, mod, io, val);
}
Expand Down

0 comments on commit 8467ded

Please sign in to comment.