* [PATCH 05/09] OMAP3 clock: Revert "OMAP2/3 clock: store planned clock rates into temporary rate storage"
@ 2009-03-20 13:26 Nayak, Rajendra
0 siblings, 0 replies; only message in thread
From: Nayak, Rajendra @ 2009-03-20 13:26 UTC (permalink / raw)
To: linux-omap; +Cc: Nayak, Rajendra
From: Rajendra Nayak <rnayak@ti.com>
This reverts commit a5e87de0795f569e9eb75d2bc0c937f3170d9c19.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Tero Kristo <tero.kristo@nokia.com>
---
arch/arm/mach-omap2/clock.c | 36 +++++++++++-------------------------
1 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index c29ea77..612db25 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -784,18 +784,10 @@ int omap2_clk_set_rate(struct clk *clk, unsigned long rate)
{
int ret = -EINVAL;
- if (!clk->set_rate)
- return -EINVAL;
-
- if (clk->notifier_count) {
- clk->temp_rate = rate;
- propagate_rate(clk, TEMP_RATE);
- }
-
- pr_debug("clock: %s: set_rate from %ld Hz to %ld Hz\n", clk->name,
- clk->rate, rate);
+ pr_debug("clock: set_rate for clock %s to rate %ld\n", clk->name, rate);
- ret = clk->set_rate(clk, rate);
+ if (clk->set_rate != NULL)
+ ret = clk->set_rate(clk, rate);
return ret;
}
@@ -837,7 +829,6 @@ static u32 _omap2_clksel_get_src_field(struct clk *src_clk, struct clk *clk,
int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
{
u32 field_val, v, parent_div;
- unsigned long orig_rate, new_rate;
if (!clk->clksel)
return -EINVAL;
@@ -846,16 +837,6 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
if (!parent_div)
return -EINVAL;
- orig_rate = clk->rate;
- new_rate = new_parent->rate;
- if (parent_div > 0)
- new_rate /= parent_div;
-
- if (clk->notifier_count) {
- clk->temp_rate = new_rate;
- propagate_rate(clk, TEMP_RATE);
- }
-
if (clk->usecount > 0)
_omap2_clk_disable(clk);
@@ -872,10 +853,15 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
_omap2_clk_enable(clk);
clk->parent = new_parent;
- clk->rate = new_rate;
- pr_debug("clock: %s: set parent to %s (orig rate %ld, new rate %ld)\n",
- clk->name, clk->parent->name, orig_rate, new_rate);
+ /* CLKSEL clocks follow their parents' rates, divided by a divisor */
+ clk->rate = new_parent->rate;
+
+ if (parent_div > 0)
+ clk->rate /= parent_div;
+
+ pr_debug("clock: set parent of %s to %s (new rate %ld)\n",
+ clk->name, clk->parent->name, clk->rate);
return 0;
}
--
1.5.4.3
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2009-03-20 13:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-03-20 13:26 [PATCH 05/09] OMAP3 clock: Revert "OMAP2/3 clock: store planned clock rates into temporary rate storage" Nayak, Rajendra
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).