| From cc6b7c7bd649ee3b12d08615d0bfe303fb544687 Mon Sep 17 00:00:00 2001 |
| From: Ben Dooks <ben.dooks@codethink.co.uk> |
| Date: Thu, 10 Apr 2014 18:16:33 -0700 |
| Subject: ASoC: rsnd: fix clock prepare/unprepare |
| |
| 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> |
| (cherry picked from commit 79861bbb759053a9b91026becc0915d0f1f8d37d) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/sh/rcar/src.c | 4 ++-- |
| sound/soc/sh/rcar/ssi.c | 4 ++-- |
| 2 files changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c |
| index 6232b7d307aa..4d0720ed5a90 100644 |
| --- a/sound/soc/sh/rcar/src.c |
| +++ b/sound/soc/sh/rcar/src.c |
| @@ -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; |
| } |
| @@ -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; |
| } |
| diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c |
| index 4b7e20603dd7..1d8387c25bd8 100644 |
| --- a/sound/soc/sh/rcar/ssi.c |
| +++ b/sound/soc/sh/rcar/ssi.c |
| @@ -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)) |
| @@ -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)); |
| -- |
| 2.1.2 |
| |