1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 647d056df88c..999777a66505 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -2570,14 +2570,17 @@ static int __clk_core_init(struct clk_core *core)
          */
         hlist_for_each_entry_safe(orphan, tmp2, &clk_orphan_list, child_node) {
                 struct clk_core *parent = __clk_init_parent(orphan);
+                unsigned long flags;
 
                 /*
                  * we could call __clk_set_parent, but that would result in a
                  * redundant call to the .set_rate op, if it exists
                  */
                 if (parent) {
-                        __clk_set_parent_before(orphan, parent);
-                        __clk_set_parent_after(orphan, parent, NULL);
+                        /* update the clk tree topology */
+                        flags = clk_enable_lock();
+                        clk_reparent(orphan, parent);
+                        clk_enable_unlock(flags);
                         __clk_recalc_accuracies(orphan);
                         __clk_recalc_rates(orphan, 0);
                 }