Merge remote-tracking branch 'regulator/topic/core' into regulator-next

[linux-2.6-microblaze.git] / drivers / clk / clk-si5351.c

diff --git a/drivers/clk/clk-si5351.c b/drivers/clk/clk-si5351.c
index 30335d3..e39e1e6 100644 (file)
--- a/drivers/clk/clk-si5351.c
+++ b/drivers/clk/clk-si5351.c
@@ -552,7 +552,8 @@ static const struct clk_ops si5351_pll_ops = {
  * MSx_P2[19:0] = 128 * b - c * floor(128 * b/c) = (128*b) mod c
  * MSx_P3[19:0] = c
  *
- * MS[6,7] are integer (P1) divide only, P2 = 0, P3 = 0
+ * MS[6,7] are integer (P1) divide only, P1 = divide value,
+ * P2 and P3 are not applicable
  *
  * for 150MHz < fOUT <= 160MHz:
  *
@@ -606,9 +607,6 @@ static unsigned long si5351_msynth_recalc_rate(struct clk_hw *hw,
        if (!hwdata->params.valid)
                si5351_read_parameters(hwdata->drvdata, reg, &hwdata->params);
 
-       if (hwdata->params.p3 == 0)
-               return parent_rate;
-
        /*
         * multisync0-5: fOUT = (128 * P3 * fIN) / (P1*P3 + P2 + 512*P3)
         * multisync6-7: fOUT = fIN / P1
@@ -616,6 +614,8 @@ static unsigned long si5351_msynth_recalc_rate(struct clk_hw *hw,
        rate = parent_rate;
        if (hwdata->num > 5) {
                m = hwdata->params.p1;
+       } else if (hwdata->params.p3 == 0) {
+               return parent_rate;
        } else if ((si5351_reg_read(hwdata->drvdata, reg + 2) &
                    SI5351_OUTPUT_CLK_DIVBY4) == SI5351_OUTPUT_CLK_DIVBY4) {
                m = 4;
@@ -679,6 +679,16 @@ static long si5351_msynth_round_rate(struct clk_hw *hw, unsigned long rate,
                c = 1;
 
                *parent_rate = a * rate;
+       } else if (hwdata->num >= 6) {
+               /* determine the closest integer divider */
+               a = DIV_ROUND_CLOSEST(*parent_rate, rate);
+               if (a < SI5351_MULTISYNTH_A_MIN)
+                       a = SI5351_MULTISYNTH_A_MIN;
+               if (a > SI5351_MULTISYNTH67_A_MAX)
+                       a = SI5351_MULTISYNTH67_A_MAX;
+
+               b = 0;
+               c = 1;
        } else {
                unsigned long rfrac, denom;
 
@@ -692,9 +702,7 @@ static long si5351_msynth_round_rate(struct clk_hw *hw, unsigned long rate,
                a = *parent_rate / rate;
                if (a < SI5351_MULTISYNTH_A_MIN)
                        a = SI5351_MULTISYNTH_A_MIN;
-               if (hwdata->num >= 6 && a > SI5351_MULTISYNTH67_A_MAX)
-                       a = SI5351_MULTISYNTH67_A_MAX;
-               else if (a > SI5351_MULTISYNTH_A_MAX)
+               if (a > SI5351_MULTISYNTH_A_MAX)
                        a = SI5351_MULTISYNTH_A_MAX;
 
                /* find best approximation for b/c = fVCO mod fOUT */
@@ -723,6 +731,10 @@ static long si5351_msynth_round_rate(struct clk_hw *hw, unsigned long rate,
                hwdata->params.p3 = 1;
                hwdata->params.p2 = 0;
                hwdata->params.p1 = 0;
+       } else if (hwdata->num >= 6) {
+               hwdata->params.p3 = 0;
+               hwdata->params.p2 = 0;
+               hwdata->params.p1 = a;
        } else {
                hwdata->params.p3  = c;
                hwdata->params.p2  = (128 * b) % c;