diff options
| author |   Shawn Guo <shawn.guo@linaro.org> | 2012-04-12 20:50:19 +0800 |
|---|---|---|
| committer |   Mike Turquette <mturquette@linaro.org> | 2012-04-24 16:37:40 -0700 |
| commit | f4d8af2e5ae6294d5e2220d3963def6f7ffc0873 (patch) | |
| tree | 7a7d8a03f1c73d7148167ebd9fc2fceb2f8496cc /drivers/clk/clk.c | |
| parent | clk: pass parent_rate into .set_rate (diff) | |
| download | linux-dev-f4d8af2e5ae6294d5e2220d3963def6f7ffc0873.tar.xz linux-dev-f4d8af2e5ae6294d5e2220d3963def6f7ffc0873.zip | |
clk: propagate round_rate for CLK_SET_RATE_PARENT case
Need to propagate round_rate call for the clk that has no .round_rate
operation but with flag CLK_SET_RATE_PARENT set.
For example, clk_mux is a clk with no .round_rate operation. However,
it could likely be in a clk_set_rate propagation path, saying it has
parent clk who has .round_rate and .set_rate operations.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk/clk.c')
| -rw-r--r-- | drivers/clk/clk.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 62ecac53b0a2..c6e8866289b4 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -587,8 +587,12 @@ unsigned long __clk_round_rate(struct clk *clk, unsigned long rate) if (!clk) return -EINVAL; - if (!clk->ops->round_rate) - return clk->rate; + if (!clk->ops->round_rate) { + if (clk->flags & CLK_SET_RATE_PARENT) + return __clk_round_rate(clk->parent, rate); + else + return clk->rate; + } if (clk->parent) parent_rate = clk->parent->rate; |