Code Review / kvmfornfv.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git] / kernel / drivers / clk / clk-si5351.c
diff --git a/kernel/drivers/clk/clk-si5351.c b/kernel/drivers/clk/clk-si5351.c
index 30335d3..e346b22 100644 (file)
--- a/kernel/drivers/clk/clk-si5351.c
+++ b/kernel/drivers/clk/clk-si5351.c
@@ -18,7 +18,7 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/clkdev.h>
+#include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/delay.h>
 #include <linux/err.h>
@@ -439,7 +439,7 @@ static unsigned long si5351_pll_recalc_rate(struct clk_hw *hw,
 
        dev_dbg(&hwdata->drvdata->client->dev,
                "%s - %s: p1 = %lu, p2 = %lu, p3 = %lu, parent_rate = %lu, rate = %lu\n",
-               __func__, __clk_get_name(hwdata->hw.clk),
+               __func__, clk_hw_get_name(hw),
                hwdata->params.p1, hwdata->params.p2, hwdata->params.p3,
                parent_rate, (unsigned long)rate);
 
@@ -497,7 +497,7 @@ static long si5351_pll_round_rate(struct clk_hw *hw, unsigned long rate,
 
        dev_dbg(&hwdata->drvdata->client->dev,
                "%s - %s: a = %lu, b = %lu, c = %lu, parent_rate = %lu, rate = %lu\n",
-               __func__, __clk_get_name(hwdata->hw.clk), a, b, c,
+               __func__, clk_hw_get_name(hw), a, b, c,
                *parent_rate, rate);
 
        return rate;
@@ -521,7 +521,7 @@ static int si5351_pll_set_rate(struct clk_hw *hw, unsigned long rate,
 
        dev_dbg(&hwdata->drvdata->client->dev,
                "%s - %s: p1 = %lu, p2 = %lu, p3 = %lu, parent_rate = %lu, rate = %lu\n",
-               __func__, __clk_get_name(hwdata->hw.clk),
+               __func__, clk_hw_get_name(hw),
                hwdata->params.p1, hwdata->params.p2, hwdata->params.p3,
                parent_rate, rate);
 
@@ -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;
@@ -632,7 +632,7 @@ static unsigned long si5351_msynth_recalc_rate(struct clk_hw *hw,
 
        dev_dbg(&hwdata->drvdata->client->dev,
                "%s - %s: p1 = %lu, p2 = %lu, p3 = %lu, m = %lu, parent_rate = %lu, rate = %lu\n",
-               __func__, __clk_get_name(hwdata->hw.clk),
+               __func__, clk_hw_get_name(hw),
                hwdata->params.p1, hwdata->params.p2, hwdata->params.p3,
                m, parent_rate, (unsigned long)rate);
 
@@ -663,7 +663,7 @@ static long si5351_msynth_round_rate(struct clk_hw *hw, unsigned long rate,
                divby4 = 1;
 
        /* multisync can set pll */
-       if (__clk_get_flags(hwdata->hw.clk) & CLK_SET_RATE_PARENT) {
+       if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) {
                /*
                 * find largest integer divider for max
                 * vco frequency and given target rate
@@ -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;
@@ -733,7 +745,7 @@ static long si5351_msynth_round_rate(struct clk_hw *hw, unsigned long rate,
 
        dev_dbg(&hwdata->drvdata->client->dev,
                "%s - %s: a = %lu, b = %lu, c = %lu, divby4 = %d, parent_rate = %lu, rate = %lu\n",
-               __func__, __clk_get_name(hwdata->hw.clk), a, b, c, divby4,
+               __func__, clk_hw_get_name(hw), a, b, c, divby4,
                *parent_rate, rate);
 
        return rate;
@@ -765,7 +777,7 @@ static int si5351_msynth_set_rate(struct clk_hw *hw, unsigned long rate,
 
        dev_dbg(&hwdata->drvdata->client->dev,
                "%s - %s: p1 = %lu, p2 = %lu, p3 = %lu, divby4 = %d, parent_rate = %lu, rate = %lu\n",
-               __func__, __clk_get_name(hwdata->hw.clk),
+               __func__, clk_hw_get_name(hw),
                hwdata->params.p1, hwdata->params.p2, hwdata->params.p3,
                divby4, parent_rate, rate);
 
@@ -1001,7 +1013,7 @@ static long si5351_clkout_round_rate(struct clk_hw *hw, unsigned long rate,
                rate = SI5351_CLKOUT_MIN_FREQ;
 
        /* request frequency if multisync master */
-       if (__clk_get_flags(hwdata->hw.clk) & CLK_SET_RATE_PARENT) {
+       if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) {
                /* use r divider for frequencies below 1MHz */
                rdiv = SI5351_OUTPUT_CLK_DIV_1;
                while (rate < SI5351_MULTISYNTH_MIN_FREQ &&
@@ -1030,7 +1042,7 @@ static long si5351_clkout_round_rate(struct clk_hw *hw, unsigned long rate,
 
        dev_dbg(&hwdata->drvdata->client->dev,
                "%s - %s: rdiv = %u, parent_rate = %lu, rate = %lu\n",
-               __func__, __clk_get_name(hwdata->hw.clk), (1 << rdiv),
+               __func__, clk_hw_get_name(hw), (1 << rdiv),
                *parent_rate, rate);
 
        return rate;
@@ -1081,7 +1093,7 @@ static int si5351_clkout_set_rate(struct clk_hw *hw, unsigned long rate,
 
        dev_dbg(&hwdata->drvdata->client->dev,
                "%s - %s: rdiv = %u, parent_rate = %lu, rate = %lu\n",
-               __func__, __clk_get_name(hwdata->hw.clk), (1 << rdiv),
+               __func__, clk_hw_get_name(hw), (1 << rdiv),
                parent_rate, rate);
 
        return 0;
@@ -1171,13 +1183,13 @@ static int si5351_dt_parse(struct i2c_client *client,
                if (of_property_read_u32(child, "reg", &num)) {
                        dev_err(&client->dev, "missing reg property of %s\n",
                                child->name);
-                       return -EINVAL;
+                       goto put_child;
                }
 
                if (num >= 8 ||
                    (variant == SI5351_VARIANT_A3 && num >= 3)) {
                        dev_err(&client->dev, "invalid clkout %d\n", num);
-                       return -EINVAL;
+                       goto put_child;
                }
 
                if (!of_property_read_u32(child, "silabs,multisynth-source",
@@ -1195,7 +1207,7 @@ static int si5351_dt_parse(struct i2c_client *client,
                                dev_err(&client->dev,
                                        "invalid parent %d for multisynth %d\n",
                                        val, num);
-                               return -EINVAL;
+                               goto put_child;
                        }
                }
 
@@ -1218,7 +1230,7 @@ static int si5351_dt_parse(struct i2c_client *client,
                                        dev_err(&client->dev,
                                                "invalid parent %d for clkout %d\n",
                                                val, num);
-                                       return -EINVAL;
+                                       goto put_child;
                                }
                                pdata->clkout[num].clkout_src =
                                        SI5351_CLKOUT_SRC_CLKIN;
@@ -1227,7 +1239,7 @@ static int si5351_dt_parse(struct i2c_client *client,
                                dev_err(&client->dev,
                                        "invalid parent %d for clkout %d\n",
                                        val, num);
-                               return -EINVAL;
+                               goto put_child;
                        }
                }
 
@@ -1244,7 +1256,7 @@ static int si5351_dt_parse(struct i2c_client *client,
                                dev_err(&client->dev,
                                        "invalid drive strength %d for clkout %d\n",
                                        val, num);
-                               return -EINVAL;
+                               goto put_child;
                        }
                }
 
@@ -1271,7 +1283,7 @@ static int si5351_dt_parse(struct i2c_client *client,
                                dev_err(&client->dev,
                                        "invalid disable state %d for clkout %d\n",
                                        val, num);
-                               return -EINVAL;
+                               goto put_child;
                        }
                }
 
@@ -1284,6 +1296,9 @@ static int si5351_dt_parse(struct i2c_client *client,
        client->dev.platform_data = pdata;
 
        return 0;
+put_child:
+       of_node_put(child);
+       return -EINVAL;
 }
 #else
 static int si5351_dt_parse(struct i2c_client *client, enum si5351_variant variant)