| From 52f54387c643cc78476a5f67c8a39fb850538a41 Mon Sep 17 00:00:00 2001 |
| From: Jerome Brunet <jbrunet@baylibre.com> |
| Date: Tue, 24 Sep 2019 14:39:52 +0200 |
| Subject: [PATCH] clk: actually call the clock init before any other callback |
| of the clock |
| |
| commit f6fa75ca912be6021335de63a32aa4d295f3c524 upstream. |
| |
| __clk_init_parent() will call the .get_parent() callback of the clock |
| so .init() must run before. |
| |
| Fixes: 541debae0adf ("clk: call the clock init() callback before any other ops callback") |
| Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> |
| Link: https://lkml.kernel.org/r/20190924123954.31561-2-jbrunet@baylibre.com |
| Signed-off-by: Stephen Boyd <sboyd@kernel.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c |
| index 2c5a21a96935..eb51f3df171d 100644 |
| --- a/drivers/clk/clk.c |
| +++ b/drivers/clk/clk.c |
| @@ -3276,6 +3276,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); |
| |
| /* |
| @@ -3301,17 +3316,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); |
| - |
| - /* |
| * Set clk's accuracy. The preferred method is to use |
| * .recalc_accuracy. For simple clocks and lazy developers the default |
| * fallback is to use the parent's accuracy. If a clock doesn't have a |
| -- |
| 2.7.4 |
| |