[PATCH] ASoC: rsnd: fix clock prepare/unprepare

[PATCH] ASoC: rsnd: fix clock prepare/unprepare

[Kuninori Morimoto]

From: Ben Dooks <ben.dooks@codethink.co.uk>

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>
---
This patch is for current linus/master tree

 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 6232b7d..4d0720e 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 4b7e206..1d8387c 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));
-- 
1.7.9.5

Re: [PATCH] ASoC: rsnd: fix clock prepare/unprepare

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 630 bytes --]

On Thu, Apr 10, 2014 at 06:16:33PM -0700, Kuninori Morimoto wrote:
> From: Ben Dooks <ben.dooks@codethink.co.uk>
> 
> 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>

This is written by you and sent by you but also signed off by
Morimoto-san - what's going on there?

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [PATCH] ASoC: rsnd: fix clock prepare/unprepare

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 608 bytes --]

On Thu, Apr 10, 2014 at 06:16:33PM -0700, Kuninori Morimoto wrote:
> From: Ben Dooks <ben.dooks@codethink.co.uk>
> 
> 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>

Sorry, for some reason I misread this as being sent by Ben - applied,
thanks.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [PATCH] ASoC: rsnd: fix clock prepare/unprepare

[Kuninori Morimoto]

Hi Mark

> > From: Ben Dooks <ben.dooks@codethink.co.uk>
> > 
> > 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>
> 
> Sorry, for some reason I misread this as being sent by Ben - applied,
> thanks.

Sorry. I didn't explain about that.
but, Thank you