[ARM] omap: clks: call recalc after any rate change

This implements the remainder of:
  OMAP clock: move rate recalc, propagation code up to plat-omap/clock.c
from Paul Walmsley which is not covered by the previous:
  [ARM] omap: move clock propagation into core omap clock code
  [ARM] omap: remove unnecessary calls to propagate_rate()
  [ARM] omap: move propagate_rate() calls into generic omap clock code
commits.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 12 insertions, 4 deletions

diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
index 5272a2212abd..54da27af0bd5 100644
--- a/arch/arm/plat-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
@@ -140,8 +140,12 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
         spin_lock_irqsave(&clockfw_lock, flags);
         if (arch_clock->clk_set_rate)
                 ret = arch_clock->clk_set_rate(clk, rate);
-        if (ret == 0 && (clk->flags & RATE_PROPAGATES))
-                propagate_rate(clk);
+        if (ret == 0) {
+                if (clk->recalc)
+                        clk->recalc(clk);
+                if (clk->flags & RATE_PROPAGATES)
+                        propagate_rate(clk);
+        }
         spin_unlock_irqrestore(&clockfw_lock, flags);
 
         return ret;
@@ -159,8 +163,12 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
         spin_lock_irqsave(&clockfw_lock, flags);
         if (arch_clock->clk_set_parent)
                 ret = arch_clock->clk_set_parent(clk, parent);
-        if (ret == 0 && (clk->flags & RATE_PROPAGATES))
-                propagate_rate(clk);
+        if (ret == 0) {
+                if (clk->recalc)
+                        clk->recalc(clk);
+                if (clk->flags & RATE_PROPAGATES)
+                        propagate_rate(clk);
+        }
         spin_unlock_irqrestore(&clockfw_lock, flags);
 
         return ret;