1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 2fd28ddd06c..9955ad7e786 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -1298,12 +1298,20 @@ int __clk_init(struct device *dev, struct clk *clk)
          * walk the list of orphan clocks and reparent any that are children of
          * this clock
          */
-        hlist_for_each_entry_safe(orphan, tmp, tmp2, &clk_orphan_list, child_node)
+        hlist_for_each_entry_safe(orphan, tmp, tmp2, &clk_orphan_list, child_node) {
+                if (orphan->ops->get_parent) {
+                        i = orphan->ops->get_parent(orphan->hw);
+                        if (!strcmp(clk->name, orphan->parent_names[i]))
+                                __clk_reparent(orphan, clk);
+                        continue;
+                }
+
                 for (i = 0; i < orphan->num_parents; i++)
                         if (!strcmp(clk->name, orphan->parent_names[i])) {
                                 __clk_reparent(orphan, clk);
                                 break;
                         }
+         }
 
         /*
          * optional platform-specific magic