Skip to content

Commit

Permalink
ASoC: rsnd: add rsnd_src_initialize_lock/unlock()
Browse files Browse the repository at this point in the history
Renesas SCU (Sampling Rate Convert Unit) includes SRC/CTU/MIX/DVC,
and these have similar register. xxxIR (Initialization Register) is one
of them. These xxxIR need be set to 1 during initialization.
Current rsnd driver has src.c / dvc.c, and we will have mix.c.
It is readable if these have same named function.
This patch adds rsnd_src_initialize_lock/unlock() and make sure it

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Keita Kobayashi <keita.kobayashi.ym@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Jul 16, 2015
1 parent 3bb3d36 commit d1ade51
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions sound/soc/sh/rcar/src.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,14 @@ static void rsnd_src_soft_reset(struct rsnd_mod *mod)
rsnd_mod_write(mod, SRC_SWRSR, 1);
}


#define rsnd_src_initialize_lock(mod) __rsnd_src_initialize_lock(mod, 1)
#define rsnd_src_initialize_unlock(mod) __rsnd_src_initialize_lock(mod, 0)
static void __rsnd_src_initialize_lock(struct rsnd_mod *mod, u32 enable)
{
rsnd_mod_write(mod, SRC_SRCIR, enable);
}

static struct dma_chan *rsnd_src_dma_req(struct rsnd_dai_stream *io,
struct rsnd_mod *mod)
{
Expand Down Expand Up @@ -362,17 +370,13 @@ static int rsnd_src_init(struct rsnd_mod *mod,

rsnd_src_soft_reset(mod);

rsnd_src_initialize_lock(mod);

src->err = 0;

/* reset sync convert_rate */
src->sync.val = 0;

/*
* Initialize the operation of the SRC internal circuits
* see rsnd_src_start()
*/
rsnd_mod_write(mod, SRC_SRCIR, 1);

return 0;
}

Expand All @@ -399,11 +403,7 @@ static int rsnd_src_quit(struct rsnd_mod *mod,

static int rsnd_src_start(struct rsnd_mod *mod)
{
/*
* Cancel the initialization and operate the SRC function
* see rsnd_src_init()
*/
rsnd_mod_write(mod, SRC_SRCIR, 0);
rsnd_src_initialize_unlock(mod);

return 0;
}
Expand Down

0 comments on commit d1ade51

Please sign in to comment.