1 files changed, 40 insertions, 18 deletions

diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
index b49942b9fe50..b6234a5da12d 100644
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
@@ -28,12 +28,10 @@
  * parent - fixed parent.  No clk_set_parent support
  */
 
-#define div_mask(width) ((1 << (width)) - 1)
-
 static unsigned int _get_table_maxdiv(const struct clk_div_table *table,
                                       u8 width)
 {
-        unsigned int maxdiv = 0, mask = div_mask(width);
+        unsigned int maxdiv = 0, mask = clk_div_mask(width);
         const struct clk_div_table *clkt;
 
         for (clkt = table; clkt->div; clkt++)
@@ -57,12 +55,12 @@ static unsigned int _get_maxdiv(const struct clk_div_table *table, u8 width,
                                 unsigned long flags)
 {
         if (flags & CLK_DIVIDER_ONE_BASED)
-                return div_mask(width);
+                return clk_div_mask(width);
         if (flags & CLK_DIVIDER_POWER_OF_TWO)
-                return 1 << div_mask(width);
+                return 1 << clk_div_mask(width);
         if (table)
                 return _get_table_maxdiv(table, width);
-        return div_mask(width) + 1;
+        return clk_div_mask(width) + 1;
 }
 
 static unsigned int _get_table_div(const struct clk_div_table *table,
@@ -84,7 +82,7 @@ static unsigned int _get_div(const struct clk_div_table *table,
         if (flags & CLK_DIVIDER_POWER_OF_TWO)
                 return 1 << val;
         if (flags & CLK_DIVIDER_MAX_AT_ZERO)
-                return val ? val : div_mask(width) + 1;
+                return val ? val : clk_div_mask(width) + 1;
         if (table)
                 return _get_table_div(table, val);
         return val + 1;
@@ -109,7 +107,7 @@ static unsigned int _get_val(const struct clk_div_table *table,
         if (flags & CLK_DIVIDER_POWER_OF_TWO)
                 return __ffs(div);
         if (flags & CLK_DIVIDER_MAX_AT_ZERO)
-                return (div == div_mask(width) + 1) ? 0 : div;
+                return (div == clk_div_mask(width) + 1) ? 0 : div;
         if (table)
                 return  _get_table_val(table, div);
         return div - 1;
@@ -141,7 +139,7 @@ static unsigned long clk_divider_recalc_rate(struct clk_hw *hw,
         unsigned int val;
 
         val = clk_readl(divider->reg) >> divider->shift;
-        val &= div_mask(divider->width);
+        val &= clk_div_mask(divider->width);
 
         return divider_recalc_rate(hw, parent_rate, val, divider->table,
                                    divider->flags, divider->width);
@@ -344,19 +342,43 @@ long divider_round_rate_parent(struct clk_hw *hw, struct clk_hw *parent,
 }
 EXPORT_SYMBOL_GPL(divider_round_rate_parent);
 
+long divider_ro_round_rate_parent(struct clk_hw *hw, struct clk_hw *parent,
+                                  unsigned long rate, unsigned long *prate,
+                                  const struct clk_div_table *table, u8 width,
+                                  unsigned long flags, unsigned int val)
+{
+        int div;
+
+        div = _get_div(table, val, flags, width);
+
+        /* Even a read-only clock can propagate a rate change */
+        if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) {
+                if (!parent)
+                        return -EINVAL;
+
+                *prate = clk_hw_round_rate(parent, rate * div);
+        }
+
+        return DIV_ROUND_UP_ULL((u64)*prate, div);
+}
+EXPORT_SYMBOL_GPL(divider_ro_round_rate_parent);
+
+
 static long clk_divider_round_rate(struct clk_hw *hw, unsigned long rate,
                                 unsigned long *prate)
 {
         struct clk_divider *divider = to_clk_divider(hw);
-        int bestdiv;
 
         /* if read only, just return current value */
         if (divider->flags & CLK_DIVIDER_READ_ONLY) {
-                bestdiv = clk_readl(divider->reg) >> divider->shift;
-                bestdiv &= div_mask(divider->width);
-                bestdiv = _get_div(divider->table, bestdiv, divider->flags,
-                        divider->width);
-                return DIV_ROUND_UP_ULL((u64)*prate, bestdiv);
+                u32 val;
+
+                val = clk_readl(divider->reg) >> divider->shift;
+                val &= clk_div_mask(divider->width);
+
+                return divider_ro_round_rate(hw, rate, prate, divider->table,
+                                             divider->width, divider->flags,
+                                             val);
         }
 
         return divider_round_rate(hw, rate, prate, divider->table,
@@ -376,7 +398,7 @@ int divider_get_val(unsigned long rate, unsigned long parent_rate,
 
         value = _get_val(table, div, flags, width);
 
-        return min_t(unsigned int, value, div_mask(width));
+        return min_t(unsigned int, value, clk_div_mask(width));
 }
 EXPORT_SYMBOL_GPL(divider_get_val);
 
@@ -399,10 +421,10 @@ static int clk_divider_set_rate(struct clk_hw *hw, unsigned long rate,
                 __acquire(divider->lock);
 
         if (divider->flags & CLK_DIVIDER_HIWORD_MASK) {
-                val = div_mask(divider->width) << (divider->shift + 16);
+                val = clk_div_mask(divider->width) << (divider->shift + 16);
         } else {
                 val = clk_readl(divider->reg);
-                val &= ~(div_mask(divider->width) << divider->shift);
+                val &= ~(clk_div_mask(divider->width) << divider->shift);
         }
         val |= (u32)value << divider->shift;
         clk_writel(val, divider->reg);