2 files changed, 7 insertions, 3 deletions

diff --git a/arch/arm/mach-davinci/clock.c b/arch/arm/mach-davinci/clock.c
index 5de60ae57903..868cb7693499 100644
--- a/arch/arm/mach-davinci/clock.c
+++ b/arch/arm/mach-davinci/clock.c
@@ -279,7 +279,7 @@ static unsigned long clk_sysclk_recalc(struct clk *clk)
 
         v = __raw_readl(pll->base + clk->div_reg);
         if (v & PLLDIV_EN) {
-                plldiv = (v & PLLDIV_RATIO_MASK) + 1;
+                plldiv = (v & pll->div_ratio_mask) + 1;
                 if (plldiv)
                         rate /= plldiv;
         }
@@ -319,7 +319,7 @@ static unsigned long clk_pllclk_recalc(struct clk *clk)
         if (pll->flags & PLL_HAS_PREDIV) {
                 prediv = __raw_readl(pll->base + PREDIV);
                 if (prediv & PLLDIV_EN)
-                        prediv = (prediv & PLLDIV_RATIO_MASK) + 1;
+                        prediv = (prediv & pll->div_ratio_mask) + 1;
                 else
                         prediv = 1;
         }
@@ -331,7 +331,7 @@ static unsigned long clk_pllclk_recalc(struct clk *clk)
         if (pll->flags & PLL_HAS_POSTDIV) {
                 postdiv = __raw_readl(pll->base + POSTDIV);
                 if (postdiv & PLLDIV_EN)
-                        postdiv = (postdiv & PLLDIV_RATIO_MASK) + 1;
+                        postdiv = (postdiv & pll->div_ratio_mask) + 1;
                 else
                         postdiv = 1;
         }
@@ -458,6 +458,9 @@ int __init davinci_clk_init(struct clk_lookup *clocks)
                                 clk->recalc = clk_leafclk_recalc;
                 }
 
+                if (clk->pll_data && !clk->pll_data->div_ratio_mask)
+                        clk->pll_data->div_ratio_mask = PLLDIV_RATIO_MASK;
+
                 if (clk->recalc)
                         clk->rate = clk->recalc(clk);
 
diff --git a/arch/arm/mach-davinci/clock.h b/arch/arm/mach-davinci/clock.h
index 53a0f7b90119..ce260153a717 100644
--- a/arch/arm/mach-davinci/clock.h
+++ b/arch/arm/mach-davinci/clock.h
@@ -76,6 +76,7 @@ struct pll_data {
         u32 num;
         u32 flags;
         u32 input_rate;
+        u32 div_ratio_mask;
 };
 #define PLL_HAS_PREDIV          0x01
 #define PLL_HAS_POSTDIV         0x02