Skip to content

Commit

Permalink
ASoC: rsnd: fix clock prepare/unprepare
Browse files Browse the repository at this point in the history
As with the previous commit, before a clock can be used it must be prepared
for use. Change from clk_enable() and clk_disable() to the versions of the
calls which also prepare and un-prepare the clocks.

Will fix warnings from the clock code when this is used.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Ben Dooks authored and Mark Brown committed Apr 11, 2014
1 parent ab5d6fb commit 79861bb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions sound/soc/sh/rcar/src.c
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ static int rsnd_src_init(struct rsnd_mod *mod,
{
struct rsnd_src *src = rsnd_mod_to_src(mod);

clk_enable(src->clk);
clk_prepare_enable(src->clk);

return 0;
}
Expand All @@ -269,7 +269,7 @@ static int rsnd_src_quit(struct rsnd_mod *mod,
{
struct rsnd_src *src = rsnd_mod_to_src(mod);

clk_disable(src->clk);
clk_disable_unprepare(src->clk);

return 0;
}
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/sh/rcar/ssi.c
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ static void rsnd_ssi_hw_start(struct rsnd_ssi *ssi,
u32 cr;

if (0 == ssi->usrcnt) {
clk_enable(ssi->clk);
clk_prepare_enable(ssi->clk);

if (rsnd_dai_is_clk_master(rdai)) {
if (rsnd_ssi_clk_from_parent(ssi))
Expand Down Expand Up @@ -230,7 +230,7 @@ static void rsnd_ssi_hw_stop(struct rsnd_ssi *ssi,
rsnd_ssi_master_clk_stop(ssi);
}

clk_disable(ssi->clk);
clk_disable_unprepare(ssi->clk);
}

dev_dbg(dev, "ssi%d hw stopped\n", rsnd_mod_id(&ssi->mod));
Expand Down

0 comments on commit 79861bb

Please sign in to comment.