diff options
| author | Sergej Sawazki <ce3a@gmx.de> | 2015-05-11 10:44:59 +0200 |
|---|---|---|
| committer | Michael Turquette <mturquette@linaro.org> | 2015-05-13 11:52:06 -0700 |
| commit | 45b03d3e88c2068644e377cf08fc480208700b85 (patch) | |
| tree | 05b82e082bd7f9b607a46625897dbe3fef106640 /drivers/clk/clk-si5351.c | |
| parent | 2073b5e909b96f8fbc9b8a40b89c1fa316fb092c (diff) | |
| download | lwn-45b03d3e88c2068644e377cf08fc480208700b85.tar.gz lwn-45b03d3e88c2068644e377cf08fc480208700b85.zip | |
clk: si5351: fix .recalc_rate for multisynth 6-7
MS6 and MS7 do not have the MSx_P3 field. Do the 'params.p3 == 0'
check for MS0-M5 only. See [AN619, p. 6] for details.
Referenced document:
[AN619] Manually Generating an Si5351 Register Map, Rev. 0.4
Signed-off-by: Sergej Sawazki <ce3a@gmx.de>
Signed-off-by: Michael Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk/clk-si5351.c')
| -rw-r--r-- | drivers/clk/clk-si5351.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/clk/clk-si5351.c b/drivers/clk/clk-si5351.c index 48c5298b6bb1..e39e1e680b3c 100644 --- a/drivers/clk/clk-si5351.c +++ b/drivers/clk/clk-si5351.c @@ -607,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 @@ -617,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; |