Commit 541debae authored by Jerome Brunet's avatar Jerome Brunet Committed by Stephen Boyd
Browse files

clk: call the clock init() callback before any other ops callback 



Some clocks may need to initialize things, whatever it is, before
being able to properly operate. Move the .init() call before any
other callback, such recalc_rate() or get_phase(), so the clock
is properly setup before being used.

Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Signed-off-by: default avatarMichael Turquette <mturquette@baylibre.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 77deb66d

drivers/clk/clk.c

+11 −11
Original line number Diff line number Diff line
@@ -2929,6 +2929,17 @@ static int __clk_core_init(struct clk_core *core) 
		core->orphan = true;

	}



	/*

	 * optional platform-specific magic

	 *

	 * The .init callback is not used by any of the basic clock types, but

	 * exists for weird hardware that must perform initialization magic.

	 * Please consider other ways of solving initialization problems before

	 * using this callback, as its use is discouraged.

	 */

	if (core->ops->init)

		core->ops->init(core->hw);



	/*

	 * Set clk's accuracy.  The preferred method is to use

	 * .recalc_accuracy. For simple clocks and lazy developers the default
@@ -3006,17 +3017,6 @@ static int __clk_core_init(struct clk_core *core) 
		}

	}



	/*

	 * optional platform-specific magic

	 *

	 * The .init callback is not used by any of the basic clock types, but

	 * exists for weird hardware that must perform initialization magic.

	 * Please consider other ways of solving initialization problems before

	 * using this callback, as its use is discouraged.

	 */

	if (core->ops->init)

		core->ops->init(core->hw);



	kref_init(&core->ref);

out:

	clk_pm_runtime_put(core);