1 files changed, 17 insertions, 12 deletions

diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
index 4386697236a7..956b7e54fa1c 100644
--- a/drivers/clk/clk-composite.c
+++ b/drivers/clk/clk-composite.c
@@ -27,7 +27,7 @@ static u8 clk_composite_get_parent(struct clk_hw *hw)
         const struct clk_ops *mux_ops = composite->mux_ops;
         struct clk_hw *mux_hw = composite->mux_hw;
 
-        mux_hw->clk = hw->clk;
+        __clk_hw_set_clk(mux_hw, hw);
 
         return mux_ops->get_parent(mux_hw);
 }
@@ -38,7 +38,7 @@ static int clk_composite_set_parent(struct clk_hw *hw, u8 index)
         const struct clk_ops *mux_ops = composite->mux_ops;
         struct clk_hw *mux_hw = composite->mux_hw;
 
-        mux_hw->clk = hw->clk;
+        __clk_hw_set_clk(mux_hw, hw);
 
         return mux_ops->set_parent(mux_hw, index);
 }
@@ -50,12 +50,14 @@ static unsigned long clk_composite_recalc_rate(struct clk_hw *hw,
         const struct clk_ops *rate_ops = composite->rate_ops;
         struct clk_hw *rate_hw = composite->rate_hw;
 
-        rate_hw->clk = hw->clk;
+        __clk_hw_set_clk(rate_hw, hw);
 
         return rate_ops->recalc_rate(rate_hw, parent_rate);
 }
 
 static long clk_composite_determine_rate(struct clk_hw *hw, unsigned long rate,
+                                        unsigned long min_rate,
+                                        unsigned long max_rate,
                                         unsigned long *best_parent_rate,
                                         struct clk_hw **best_parent_p)
 {
@@ -72,8 +74,10 @@ static long clk_composite_determine_rate(struct clk_hw *hw, unsigned long rate,
         int i;
 
         if (rate_hw && rate_ops && rate_ops->determine_rate) {
-                rate_hw->clk = hw->clk;
-                return rate_ops->determine_rate(rate_hw, rate, best_parent_rate,
+                __clk_hw_set_clk(rate_hw, hw);
+                return rate_ops->determine_rate(rate_hw, rate, min_rate,
+                                                max_rate,
+                                                best_parent_rate,
                                                 best_parent_p);
         } else if (rate_hw && rate_ops && rate_ops->round_rate &&
                    mux_hw && mux_ops && mux_ops->set_parent) {
@@ -116,8 +120,9 @@ static long clk_composite_determine_rate(struct clk_hw *hw, unsigned long rate,
 
                 return best_rate;
         } else if (mux_hw && mux_ops && mux_ops->determine_rate) {
-                mux_hw->clk = hw->clk;
-                return mux_ops->determine_rate(mux_hw, rate, best_parent_rate,
+                __clk_hw_set_clk(mux_hw, hw);
+                return mux_ops->determine_rate(mux_hw, rate, min_rate,
+                                               max_rate, best_parent_rate,
                                                best_parent_p);
         } else {
                 pr_err("clk: clk_composite_determine_rate function called, but no mux or rate callback set!\n");
@@ -132,7 +137,7 @@ static long clk_composite_round_rate(struct clk_hw *hw, unsigned long rate,
         const struct clk_ops *rate_ops = composite->rate_ops;
         struct clk_hw *rate_hw = composite->rate_hw;
 
-        rate_hw->clk = hw->clk;
+        __clk_hw_set_clk(rate_hw, hw);
 
         return rate_ops->round_rate(rate_hw, rate, prate);
 }
@@ -144,7 +149,7 @@ static int clk_composite_set_rate(struct clk_hw *hw, unsigned long rate,
         const struct clk_ops *rate_ops = composite->rate_ops;
         struct clk_hw *rate_hw = composite->rate_hw;
 
-        rate_hw->clk = hw->clk;
+        __clk_hw_set_clk(rate_hw, hw);
 
         return rate_ops->set_rate(rate_hw, rate, parent_rate);
 }
@@ -155,7 +160,7 @@ static int clk_composite_is_enabled(struct clk_hw *hw)
         const struct clk_ops *gate_ops = composite->gate_ops;
         struct clk_hw *gate_hw = composite->gate_hw;
 
-        gate_hw->clk = hw->clk;
+        __clk_hw_set_clk(gate_hw, hw);
 
         return gate_ops->is_enabled(gate_hw);
 }
@@ -166,7 +171,7 @@ static int clk_composite_enable(struct clk_hw *hw)
         const struct clk_ops *gate_ops = composite->gate_ops;
         struct clk_hw *gate_hw = composite->gate_hw;
 
-        gate_hw->clk = hw->clk;
+        __clk_hw_set_clk(gate_hw, hw);
 
         return gate_ops->enable(gate_hw);
 }
@@ -177,7 +182,7 @@ static void clk_composite_disable(struct clk_hw *hw)
         const struct clk_ops *gate_ops = composite->gate_ops;
         struct clk_hw *gate_hw = composite->gate_hw;
 
-        gate_hw->clk = hw->clk;
+        __clk_hw_set_clk(gate_hw, hw);
 
         gate_ops->disable(gate_hw);
 }