summaryrefslogtreecommitdiff
path: root/drivers/clk/versatile/clk-integrator.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2014-01-20 21:46:46 +0100
committerLinus Walleij <linus.walleij@linaro.org>2014-02-13 11:20:55 +0100
commita183da637c52c74ae4634355187d3fbaa1ba9763 (patch)
tree277ab1ec855b4b4db09b7088b5ed83b671664578 /drivers/clk/versatile/clk-integrator.c
parentbf6edb4bb1fabd73bebcd0ae85cdeb14c5893f3b (diff)
clk: versatile: respect parent rate in ICST clock
If the ICST clock has a parent, respect the rate of the parent when calculating the clock frequency. As this involves modifying the ICST parameter struct, make a cloned copy (the divisor arrays should be safe) so we can update the .ref field. Do not define the reference clock on the Integrator as we have the reference clock from the device tree. Keep it everywhere else. Cc: Mike Turquette <mturquette@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/clk/versatile/clk-integrator.c')
-rw-r--r--drivers/clk/versatile/clk-integrator.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/clk/versatile/clk-integrator.c b/drivers/clk/versatile/clk-integrator.c
index 5d36a719fefb..734c4b8fe6ab 100644
--- a/drivers/clk/versatile/clk-integrator.c
+++ b/drivers/clk/versatile/clk-integrator.c
@@ -21,7 +21,6 @@
static void __iomem *cm_base;
static const struct icst_params cp_auxosc_params = {
- .ref = 24000000,
.vco_max = ICST525_VCO_MAX_5V,
.vco_min = ICST525_VCO_MIN,
.vd_min = 8,