1 files changed, 28 insertions, 0 deletions

diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
index a33f46f20a41..57a078e06efe 100644
--- a/drivers/clk/clk-composite.c
+++ b/drivers/clk/clk-composite.c
@@ -55,6 +55,30 @@ static unsigned long clk_composite_recalc_rate(struct clk_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 *best_parent_rate,
+                                        struct clk **best_parent_p)
+{
+        struct clk_composite *composite = to_clk_composite(hw);
+        const struct clk_ops *rate_ops = composite->rate_ops;
+        const struct clk_ops *mux_ops = composite->mux_ops;
+        struct clk_hw *rate_hw = composite->rate_hw;
+        struct clk_hw *mux_hw = composite->mux_hw;
+
+        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,
+                                                best_parent_p);
+        } 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,
+                                               best_parent_p);
+        } else {
+                pr_err("clk: clk_composite_determine_rate function called, but no mux or rate callback set!\n");
+                return 0;
+        }
+}
+
 static long clk_composite_round_rate(struct clk_hw *hw, unsigned long rate,
                                   unsigned long *prate)
 {
@@ -147,6 +171,8 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
                 composite->mux_ops = mux_ops;
                 clk_composite_ops->get_parent = clk_composite_get_parent;
                 clk_composite_ops->set_parent = clk_composite_set_parent;
+                if (mux_ops->determine_rate)
+                        clk_composite_ops->determine_rate = clk_composite_determine_rate;
         }
 
         if (rate_hw && rate_ops) {
@@ -170,6 +196,8 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
                 composite->rate_hw = rate_hw;
                 composite->rate_ops = rate_ops;
                 clk_composite_ops->recalc_rate = clk_composite_recalc_rate;
+                if (rate_ops->determine_rate)
+                        clk_composite_ops->determine_rate = clk_composite_determine_rate;
         }
 
         if (gate_hw && gate_ops) {