diff options
author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2015-02-06 15:13:01 +0100 |
---|---|---|
committer | Michael Turquette <mturquette@linaro.org> | 2015-02-20 04:29:19 +0100 |
commit | ec02ace8ca0a50eef430d3676de5c5fa978b0e29 (patch) | |
tree | 144c997964757068bc27ecdbd7c02ce9611e12b7 | |
parent | Revert "clk: mxs: Fix invalid 32-bit access to frac registers" (diff) | |
download | linux-ec02ace8ca0a50eef430d3676de5c5fa978b0e29.tar.xz linux-ec02ace8ca0a50eef430d3676de5c5fa978b0e29.zip |
clk: Only recalculate the rate if needed
We don't really need to recalculate the effective rate of a clock when a
per-user clock is removed, if the constraints of the later aren't
limiting the requested rate.
This was causing problems with clocks that never had a rate set before,
as rate_req would be zero. Though this could be considered a bug in the
implementation of those clocks, this should be checked somewhere else.
Fixes: 1c8e600440c7 ("clk: Add rate constraints to clocks")
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Peter De Schrijver <pdeschrijver@nvidia.com>
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Signed-off-by: Michael Turquette <mturquette@linaro.org>
-rw-r--r-- | drivers/clk/clk.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index f3a7a4425242..a27f14116cc9 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -2664,7 +2664,10 @@ void __clk_put(struct clk *clk) clk_prepare_lock(); hlist_del(&clk->child_node); - clk_core_set_rate_nolock(clk->core, clk->core->req_rate); + if (clk->min_rate > clk->core->req_rate || + clk->max_rate < clk->core->req_rate) + clk_core_set_rate_nolock(clk->core, clk->core->req_rate); + owner = clk->core->owner; kref_put(&clk->core->ref, __clk_release); |