Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
[linux-2.6-microblaze.git] / drivers / clk / clk-vt8500.c
index fe25570..b5538bb 100644 (file)
@@ -41,6 +41,7 @@ struct clk_device {
 
 #define PLL_TYPE_VT8500                0
 #define PLL_TYPE_WM8650                1
+#define PLL_TYPE_WM8750                2
 
 struct clk_pll {
        struct clk_hw   hw;
@@ -121,7 +122,16 @@ 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;
+       u32 divisor;
+
+       if (rate == 0)
+               return 0;
+
+       divisor = *prate / rate;
+
+       /* If prate / rate would be decimal, incr the divisor */
+       if (rate * divisor < *prate)
+               divisor++;
 
        /*
         * If this is a request for SDMMC we have to adjust the divisor
@@ -138,9 +148,18 @@ static int vt8500_dclk_set_rate(struct clk_hw *hw, unsigned long rate,
                                unsigned long parent_rate)
 {
        struct clk_device *cdev = to_clk_device(hw);
-       u32 divisor = parent_rate / rate;
+       u32 divisor;
        unsigned long flags = 0;
 
+       if (rate == 0)
+               return 0;
+
+       divisor =  parent_rate / rate;
+
+       /* If prate / rate would be decimal, incr the divisor */
+       if (rate * divisor < *prate)
+               divisor++;
+
        if (divisor == cdev->div_mask + 1)
                divisor = 0;
 
@@ -272,7 +291,7 @@ static __init void vtwm_device_clk_init(struct device_node *node)
        rc = of_clk_add_provider(node, of_clk_src_simple_get, clk);
        clk_register_clkdev(clk, clk_name, NULL);
 }
-
+CLK_OF_DECLARE(vt8500_device, "via,vt8500-device-clock", vtwm_device_clk_init);
 
 /* PLL clock related functions */
 
@@ -298,6 +317,16 @@ static __init void vtwm_device_clk_init(struct device_node *node)
 #define WM8650_BITS_TO_VAL(m, d1, d2)                                  \
                                ((d2 << 13) | (d1 << 10) | (m & 0x3FF))
 
+/* Helper macros for PLL_WM8750 */
+#define WM8750_PLL_MUL(x)      (((x >> 16) & 0xFF) + 1)
+#define WM8750_PLL_DIV(x)      ((((x >> 8) & 1) + 1) * (1 << (x & 7)))
+
+#define WM8750_BITS_TO_FREQ(r, m, d1, d2)                              \
+                               (r * (m+1) / ((d1+1) * (1 << d2)))
+
+#define WM8750_BITS_TO_VAL(f, m, d1, d2)                               \
+               ((f << 24) | ((m - 1) << 16) | ((d1 - 1) << 8) | d2)
+
 
 static void vt8500_find_pll_bits(unsigned long rate, unsigned long parent_rate,
                                u32 *multiplier, u32 *prediv)
@@ -361,16 +390,87 @@ static void wm8650_find_pll_bits(unsigned long rate, unsigned long parent_rate,
        /* if we got here, it wasn't an exact match */
        pr_warn("%s: requested rate %lu, found rate %lu\n", __func__, rate,
                                                        rate - best_err);
-       *multiplier = mul;
-       *divisor1 = div1;
-       *divisor2 = div2;
+       *multiplier = best_mul;
+       *divisor1 = best_div1;
+       *divisor2 = best_div2;
+}
+
+static u32 wm8750_get_filter(u32 parent_rate, u32 divisor1)
+{
+       /* calculate frequency (MHz) after pre-divisor */
+       u32 freq = (parent_rate / 1000000) / (divisor1 + 1);
+
+       if ((freq < 10) || (freq > 200))
+               pr_warn("%s: PLL recommended input frequency 10..200Mhz (requested %d Mhz)\n",
+                               __func__, freq);
+
+       if (freq >= 166)
+               return 7;
+       else if (freq >= 104)
+               return 6;
+       else if (freq >= 65)
+               return 5;
+       else if (freq >= 42)
+               return 4;
+       else if (freq >= 26)
+               return 3;
+       else if (freq >= 16)
+               return 2;
+       else if (freq >= 10)
+               return 1;
+
+       return 0;
+}
+
+static void wm8750_find_pll_bits(unsigned long rate, unsigned long parent_rate,
+                               u32 *filter, u32 *multiplier, u32 *divisor1, u32 *divisor2)
+{
+       u32 mul, div1, div2;
+       u32 best_mul, best_div1, best_div2;
+       unsigned long tclk, rate_err, best_err;
+
+       best_err = (unsigned long)-1;
+
+       /* Find the closest match (lower or equal to requested) */
+       for (div1 = 1; div1 >= 0; div1--)
+               for (div2 = 7; div2 >= 0; div2--)
+                       for (mul = 0; mul <= 255; mul++) {
+                               tclk = parent_rate * (mul + 1) / ((div1 + 1) * (1 << div2));
+                               if (tclk > rate)
+                                       continue;
+                               /* error will always be +ve */
+                               rate_err = rate - tclk;
+                               if (rate_err == 0) {
+                                       *filter = wm8750_get_filter(parent_rate, div1);
+                                       *multiplier = mul;
+                                       *divisor1 = div1;
+                                       *divisor2 = div2;
+                                       return;
+                               }
+
+                               if (rate_err < best_err) {
+                                       best_err = rate_err;
+                                       best_mul = mul;
+                                       best_div1 = div1;
+                                       best_div2 = div2;
+                               }
+                       }
+
+       /* if we got here, it wasn't an exact match */
+       pr_warn("%s: requested rate %lu, found rate %lu\n", __func__, rate,
+                                                       rate - best_err);
+
+       *filter = wm8750_get_filter(parent_rate, best_div1);
+       *multiplier = best_mul;
+       *divisor1 = best_div1;
+       *divisor2 = best_div2;
 }
 
 static int vtwm_pll_set_rate(struct clk_hw *hw, unsigned long rate,
                                unsigned long parent_rate)
 {
        struct clk_pll *pll = to_clk_pll(hw);
-       u32 mul, div1, div2;
+       u32 filter, mul, div1, div2;
        u32 pll_val;
        unsigned long flags = 0;
 
@@ -385,6 +485,9 @@ static int vtwm_pll_set_rate(struct clk_hw *hw, unsigned long rate,
                wm8650_find_pll_bits(rate, parent_rate, &mul, &div1, &div2);
                pll_val = WM8650_BITS_TO_VAL(mul, div1, div2);
                break;
+       case PLL_TYPE_WM8750:
+               wm8750_find_pll_bits(rate, parent_rate, &filter, &mul, &div1, &div2);
+               pll_val = WM8750_BITS_TO_VAL(filter, mul, div1, div2);
        default:
                pr_err("%s: invalid pll type\n", __func__);
                return 0;
@@ -405,7 +508,7 @@ static long vtwm_pll_round_rate(struct clk_hw *hw, unsigned long rate,
                                unsigned long *prate)
 {
        struct clk_pll *pll = to_clk_pll(hw);
-       u32 mul, div1, div2;
+       u32 filter, mul, div1, div2;
        long round_rate;
 
        switch (pll->type) {
@@ -417,6 +520,9 @@ static long vtwm_pll_round_rate(struct clk_hw *hw, unsigned long rate,
                wm8650_find_pll_bits(rate, *prate, &mul, &div1, &div2);
                round_rate = WM8650_BITS_TO_FREQ(*prate, mul, div1, div2);
                break;
+       case PLL_TYPE_WM8750:
+               wm8750_find_pll_bits(rate, *prate, &filter, &mul, &div1, &div2);
+               round_rate = WM8750_BITS_TO_FREQ(*prate, mul, div1, div2);
        default:
                round_rate = 0;
        }
@@ -440,6 +546,10 @@ static unsigned long vtwm_pll_recalc_rate(struct clk_hw *hw,
                pll_freq = parent_rate * WM8650_PLL_MUL(pll_val);
                pll_freq /= WM8650_PLL_DIV(pll_val);
                break;
+       case PLL_TYPE_WM8750:
+               pll_freq = parent_rate * WM8750_PLL_MUL(pll_val);
+               pll_freq /= WM8750_PLL_DIV(pll_val);
+               break;
        default:
                pll_freq = 0;
        }
@@ -502,20 +612,19 @@ static void __init vt8500_pll_init(struct device_node *node)
 {
        vtwm_pll_clk_init(node, PLL_TYPE_VT8500);
 }
+CLK_OF_DECLARE(vt8500_pll, "via,vt8500-pll-clock", vt8500_pll_init);
 
 static void __init wm8650_pll_init(struct device_node *node)
 {
        vtwm_pll_clk_init(node, PLL_TYPE_WM8650);
 }
+CLK_OF_DECLARE(wm8650_pll, "wm,wm8650-pll-clock", wm8650_pll_init);
 
-static const __initconst struct of_device_id clk_match[] = {
-       { .compatible = "fixed-clock", .data = of_fixed_clk_setup, },
-       { .compatible = "via,vt8500-pll-clock", .data = vt8500_pll_init, },
-       { .compatible = "wm,wm8650-pll-clock", .data = wm8650_pll_init, },
-       { .compatible = "via,vt8500-device-clock",
-                                       .data = vtwm_device_clk_init, },
-       { /* sentinel */ }
-};
+static void __init wm8750_pll_init(struct device_node *node)
+{
+       vtwm_pll_clk_init(node, PLL_TYPE_WM8750);
+}
+CLK_OF_DECLARE(wm8750_pll, "wm,wm8750-pll-clock", wm8750_pll_init);
 
 void __init vtwm_clk_init(void __iomem *base)
 {
@@ -524,5 +633,5 @@ void __init vtwm_clk_init(void __iomem *base)
 
        pmc_base = base;
 
-       of_clk_init(clk_match);
+       of_clk_init(NULL);
 }