Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79861bbb authored Apr 10, 2014 by Ben Dooks Committed by Mark Brown Apr 11, 2014

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>

parent ab5d6fbd

sound/soc/sh/rcar/src.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}

sound/soc/sh/rcar/ssi.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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));