omap2 clock: call clock-specific enable/disable functions if present

Call clock-specific enable/disable functions if .enable/.disable function
pointer fields are present in struct clk.  Similar to OMAP1 clock code.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index f5ff8cd3977ca661e4c55229d1db145550187dca..ad84869226a3fa85b1d969eb23205dbfad18e5e8 100644 (file)
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -277,6 +277,9 @@ static int _omap2_clk_enable(struct clk * clk)
                return 0;
        }
 
+       if (clk->enable)
+               return clk->enable(clk);
+
        if (unlikely(clk->enable_reg == 0)) {
                printk(KERN_ERR "clock.c: Enable for %s without enable code\n",
                       clk->name);
@@ -316,6 +319,11 @@ static void _omap2_clk_disable(struct clk *clk)
        if (clk->flags & (ALWAYS_ENABLED | PARENT_CONTROLS_CLOCK))
                return;
 
+       if (clk->disable) {
+               clk->disable(clk);
+               return;
+       }
+
        if (unlikely(clk == &osc_ck)) {
                omap2_set_osc_ck(0);
                return;