Merge branch 'clk-exynos-cpu-clk' into clk-next

Folded into this merge commit is a build error fix: s/clk/core in
clk_change_rate due to the new struct clk_core

diff --cc drivers/clk/clk.c
index 1cf479b9f3b4e8b952f7e5d9b18040963fde7c99,0c0124c4eeeb857594157750d4fe8a9ac5f6a428..059e5d25c9bac688c794224cc8c92a02bebb23c8
--- 1/drivers/clk/clk.c
--- 2/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@@ -1381,42 -1752,45 +1381,45 @@@ static void clk_change_rate(struct clk_
        bool skip_set_rate = false;
        struct clk_core *old_parent;
  
 -      old_rate = clk->rate;
 +      old_rate = core->rate;
  
 -      if (clk->new_parent)
 -              best_parent_rate = clk->new_parent->rate;
 -      else if (clk->parent)
 -              best_parent_rate = clk->parent->rate;
 +      if (core->new_parent)
 +              best_parent_rate = core->new_parent->rate;
 +      else if (core->parent)
 +              best_parent_rate = core->parent->rate;
  
 -      if (clk->new_parent && clk->new_parent != clk->parent) {
 -              old_parent = __clk_set_parent_before(clk, clk->new_parent);
 -              trace_clk_set_parent(clk, clk->new_parent);
 +      if (core->new_parent && core->new_parent != core->parent) {
 +              old_parent = __clk_set_parent_before(core, core->new_parent);
 +              trace_clk_set_parent(core, core->new_parent);
  
 -              if (clk->ops->set_rate_and_parent) {
 +              if (core->ops->set_rate_and_parent) {
                        skip_set_rate = true;
 -                      clk->ops->set_rate_and_parent(clk->hw, clk->new_rate,
 +                      core->ops->set_rate_and_parent(core->hw, core->new_rate,
                                        best_parent_rate,
 -                                      clk->new_parent_index);
 -              } else if (clk->ops->set_parent) {
 -                      clk->ops->set_parent(clk->hw, clk->new_parent_index);
 +                                      core->new_parent_index);
 +              } else if (core->ops->set_parent) {
 +                      core->ops->set_parent(core->hw, core->new_parent_index);
                }
  
 -              trace_clk_set_parent_complete(clk, clk->new_parent);
 -              __clk_set_parent_after(clk, clk->new_parent, old_parent);
 +              trace_clk_set_parent_complete(core, core->new_parent);
 +              __clk_set_parent_after(core, core->new_parent, old_parent);
        }
  
 -      trace_clk_set_rate(clk, clk->new_rate);
 +      trace_clk_set_rate(core, core->new_rate);
  
 -      if (!skip_set_rate && clk->ops->set_rate)
 -              clk->ops->set_rate(clk->hw, clk->new_rate, best_parent_rate);
 +      if (!skip_set_rate && core->ops->set_rate)
 +              core->ops->set_rate(core->hw, core->new_rate, best_parent_rate);
  
 -      trace_clk_set_rate_complete(clk, clk->new_rate);
 +      trace_clk_set_rate_complete(core, core->new_rate);
  
 -      clk->rate = clk_recalc(clk, best_parent_rate);
 +      core->rate = clk_recalc(core, best_parent_rate);
  
 -      if (clk->notifier_count && old_rate != clk->rate)
 -              __clk_notify(clk, POST_RATE_CHANGE, old_rate, clk->rate);
 +      if (core->notifier_count && old_rate != core->rate)
 +              __clk_notify(core, POST_RATE_CHANGE, old_rate, core->rate);
  
 -      if (clk->flags & CLK_RECALC_NEW_RATES)
 -              (void)clk_calc_new_rates(clk, clk->new_rate);
++      if (core->flags & CLK_RECALC_NEW_RATES)
++              (void)clk_calc_new_rates(core, core->new_rate);
+ 
        /*
         * Use safe iteration, as change_rate can actually swap parents
         * for certain clock types.

diff --cc include/linux/clk-provider.h
Simple merge