CLK: vt8500: Fix SDMMC clk special cases

This patch adds some additional handling for the SDMMC special case
in round_rate and set_rate which results in invalid divisor messages
at boot time.

Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
Signed-off-by: Mike Turquette <mturquette@linaro.org>

diff --git a/drivers/clk/clk-vt8500.c b/drivers/clk/clk-vt8500.c
index a885600f5270f11422f2f0e209c92dbeeab55a59..fe25570874d6b63dd937111a3664dbec9d244e32 100644 (file)
--- a/drivers/clk/clk-vt8500.c
+++ b/drivers/clk/clk-vt8500.c
@@ -120,8 +120,17 @@ static unsigned long vt8500_dclk_recalc_rate(struct clk_hw *hw,
 static long vt8500_dclk_round_rate(struct clk_hw *hw, unsigned long rate,
                                unsigned long *prate)
 {
+       struct clk_device *cdev = to_clk_device(hw);
        u32 divisor = *prate / rate;
 
+       /*
+        * If this is a request for SDMMC we have to adjust the divisor
+        * when >31 to use the fixed predivisor
+        */
+       if ((cdev->div_mask == 0x3F) && (divisor > 31)) {
+               divisor = 64 * ((divisor / 64) + 1);
+       }
+
        return *prate / divisor;
 }
 
@@ -135,6 +144,15 @@ static int vt8500_dclk_set_rate(struct clk_hw *hw, unsigned long rate,
        if (divisor == cdev->div_mask + 1)
                divisor = 0;
 
+       /* SDMMC mask may need to be corrected before testing if its valid */
+       if ((cdev->div_mask == 0x3F) && (divisor > 31)) {
+               /*
+                * Bit 5 is a fixed /64 predivisor. If the requested divisor
+                * is >31 then correct for the fixed divisor being required.
+                */
+               divisor = 0x20 + (divisor / 64);
+       }
+
        if (divisor > cdev->div_mask) {
                pr_err("%s: invalid divisor for clock\n", __func__);
                return -EINVAL;