Merge tag 'batadv-net-for-davem-20170301' of git://git.open-mesh.org/linux-merge

[karo-tx-linux.git] / drivers / clk / sunxi-ng / ccu_mp.c

diff --git a/drivers/clk/sunxi-ng/ccu_mp.c b/drivers/clk/sunxi-ng/ccu_mp.c
index ebb1b31568a55b625af3ad9e0de01fa716015fa0..22c2ca7a2a221c1f25456e6e2548d381fbc23adf 100644 (file)
--- a/drivers/clk/sunxi-ng/ccu_mp.c
+++ b/drivers/clk/sunxi-ng/ccu_mp.c
@@ -89,11 +89,14 @@ static unsigned long ccu_mp_recalc_rate(struct clk_hw *hw,
 
        m = reg >> cmp->m.shift;
        m &= (1 << cmp->m.width) - 1;
+       m += cmp->m.offset;
+       if (!m)
+               m++;
 
        p = reg >> cmp->p.shift;
        p &= (1 << cmp->p.width) - 1;
 
-       return (parent_rate >> p) / (m + 1);
+       return (parent_rate >> p) / m;
 }
 
 static int ccu_mp_determine_rate(struct clk_hw *hw,
@@ -124,9 +127,10 @@ static int ccu_mp_set_rate(struct clk_hw *hw, unsigned long rate,
        reg = readl(cmp->common.base + cmp->common.reg);
        reg &= ~GENMASK(cmp->m.width + cmp->m.shift - 1, cmp->m.shift);
        reg &= ~GENMASK(cmp->p.width + cmp->p.shift - 1, cmp->p.shift);
+       reg |= (m - cmp->m.offset) << cmp->m.shift;
+       reg |= ilog2(p) << cmp->p.shift;
 
-       writel(reg | (ilog2(p) << cmp->p.shift) | ((m - 1) << cmp->m.shift),
-              cmp->common.base + cmp->common.reg);
+       writel(reg, cmp->common.base + cmp->common.reg);
 
        spin_unlock_irqrestore(cmp->common.lock, flags);