Commit 72f5df2c authored Jan 16, 2017 by Geert Uytterhoeven

clk: renesas: cpg-mssr: Migrate to CLK_IS_CRITICAL



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 32b9b109 ("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>

parent e6bdf28e

drivers/clk/renesas/renesas-cpg-mssr.c

+2 −9

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

Admin message