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

Commit 93a3eff6 authored by Jerome Brunet's avatar Jerome Brunet Committed by Greg Kroah-Hartman
Browse files

clk: actually call the clock init before any other callback of the clock 



[ Upstream commit f6fa75ca912be6021335de63a32aa4d295f3c524 ]

 __clk_init_parent() will call the .get_parent() callback of the clock
 so .init() must run before.

Fixes: 541debae ("clk: call the clock init() callback before any other ops callback")
Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Link: https://lkml.kernel.org/r/20190924123954.31561-2-jbrunet@baylibre.com


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent fa0150ba

drivers/clk/clk.c

+15 −11
Original line number Diff line number Diff line
@@ -3320,6 +3320,21 @@ static int __clk_core_init(struct clk_core *core) 
		goto out;

	}



	/*

	 * 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 it exist, this callback should called before any other callback of

	 * the clock

	 */

	if (core->ops->init)

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





	core->parent = __clk_init_parent(core);



	/*
@@ -3344,17 +3359,6 @@ 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