| Message ID | 1484657190-12838-2-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On 01/17, Geert Uytterhoeven wrote: > When the Renesas CPG/MSSR driver was introduced, it was anticipated that > critical clocks would be handled through a new CLK_ENABLE_HAND_OFF flag > soon. However, CLK_ENABLE_HAND_OFF never made it upstream. > > Instead, commit 32b9b10961860860 ("clk: Allow clocks to be marked as > CRITICAL") introduced CLK_IS_CRITICAL, a flag with slightly differing > semantics. Still, it can be used to prevent e.g. the GIC module clock > from being turned off, until the GIC-400 driver has full support for > Runtime PM. > > Hence migrate the Renesas CPG/MSSR driver from CLK_ENABLE_HAND_OFF to > CLK_IS_CRITICAL. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- Acked-by: Stephen Boyd <sboyd@codeaurora.org>
diff --git a/drivers/clk/renesas/renesas-cpg-mssr.c b/drivers/clk/renesas/renesas-cpg-mssr.c index 8359ce75db7aa4fb..6947482d48a55094 100644 --- a/drivers/clk/renesas/renesas-cpg-mssr.c +++ b/drivers/clk/renesas/renesas-cpg-mssr.c @@ -346,17 +346,10 @@ static void __init cpg_mssr_register_mod_clk(const struct mssr_mod_clk *mod, init.flags = CLK_IS_BASIC | CLK_SET_RATE_PARENT; for (i = 0; i < info->num_crit_mod_clks; i++) if (id == info->crit_mod_clks[i]) { -#ifdef CLK_ENABLE_HAND_OFF - dev_dbg(dev, "MSTP %s setting CLK_ENABLE_HAND_OFF\n", + dev_dbg(dev, "MSTP %s setting CLK_IS_CRITICAL\n", mod->name); - init.flags |= CLK_ENABLE_HAND_OFF; + init.flags |= CLK_IS_CRITICAL; break; -#else - dev_dbg(dev, "Ignoring MSTP %s to prevent disabling\n", - mod->name); - kfree(clock); - return; -#endif } parent_name = __clk_get_name(parent);
When the Renesas CPG/MSSR driver was introduced, it was anticipated that critical clocks would be handled through a new CLK_ENABLE_HAND_OFF flag soon. However, CLK_ENABLE_HAND_OFF never made it upstream. Instead, commit 32b9b10961860860 ("clk: Allow clocks to be marked as CRITICAL") introduced CLK_IS_CRITICAL, a flag with slightly differing semantics. Still, it can be used to prevent e.g. the GIC module clock from being turned off, until the GIC-400 driver has full support for Runtime PM. Hence migrate the Renesas CPG/MSSR driver from CLK_ENABLE_HAND_OFF to CLK_IS_CRITICAL. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- Should this have a Fixes tag? ;-) Fixes: 32b9b10961860860 ("clk: Allow clocks to be marked as CRITICAL") --- drivers/clk/renesas/renesas-cpg-mssr.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)