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>
This commit is contained in:
parent
ab5d6fbdb7
commit
79861bbb75
@ -258,7 +258,7 @@ static int rsnd_src_init(struct rsnd_mod *mod,
|
|||||||
{
|
{
|
||||||
struct rsnd_src *src = rsnd_mod_to_src(mod);
|
struct rsnd_src *src = rsnd_mod_to_src(mod);
|
||||||
|
|
||||||
clk_enable(src->clk);
|
clk_prepare_enable(src->clk);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -269,7 +269,7 @@ static int rsnd_src_quit(struct rsnd_mod *mod,
|
|||||||
{
|
{
|
||||||
struct rsnd_src *src = rsnd_mod_to_src(mod);
|
struct rsnd_src *src = rsnd_mod_to_src(mod);
|
||||||
|
|
||||||
clk_disable(src->clk);
|
clk_disable_unprepare(src->clk);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -171,7 +171,7 @@ static void rsnd_ssi_hw_start(struct rsnd_ssi *ssi,
|
|||||||
u32 cr;
|
u32 cr;
|
||||||
|
|
||||||
if (0 == ssi->usrcnt) {
|
if (0 == ssi->usrcnt) {
|
||||||
clk_enable(ssi->clk);
|
clk_prepare_enable(ssi->clk);
|
||||||
|
|
||||||
if (rsnd_dai_is_clk_master(rdai)) {
|
if (rsnd_dai_is_clk_master(rdai)) {
|
||||||
if (rsnd_ssi_clk_from_parent(ssi))
|
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);
|
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));
|
dev_dbg(dev, "ssi%d hw stopped\n", rsnd_mod_id(&ssi->mod));
|
||||||
|
Loading…
Reference in New Issue
Block a user