summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/clock.c
diff options
context:
space:
mode:
authorTero Kristo <tero.kristo@nokia.com>2009-01-28 12:27:45 -0700
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-02-08 17:50:40 +0000
commit8463e20a58e8b8c88fab948b8610504cbf604294 (patch)
treef104ac8fefe110116b66af2730145e9e2b8658cb /arch/arm/mach-omap2/clock.c
parent0eafd4725cf5d828e76e474b8991a228bbdd3f2b (diff)
downloadop-kernel-dev-8463e20a58e8b8c88fab948b8610504cbf604294.zip
op-kernel-dev-8463e20a58e8b8c88fab948b8610504cbf604294.tar.gz
[ARM] OMAP3: PM: Make sure clk_disable_unused() order is correct
Current implementation will disable clocks in the order defined in clock34xx.h, at least DPLL4_M2X2 will hang in certain cases (and prevent retention / off) if clocks are not disabled in correct order. This patch makes sure the parent clocks will be active when disabling a clock. linux-omap source commit is 672680063420ef8c8c4e7271984bb9cc08171d29. Signed-off-by: Tero Kristo <tero.kristo@nokia.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap2/clock.c')
-rw-r--r--arch/arm/mach-omap2/clock.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index 18fddb6..478ca66 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -1000,6 +1000,10 @@ void omap2_clk_disable_unused(struct clk *clk)
return;
printk(KERN_INFO "Disabling unused clock \"%s\"\n", clk->name);
- _omap2_clk_disable(clk);
+ if (cpu_is_omap34xx()) {
+ omap2_clk_enable(clk);
+ omap2_clk_disable(clk);
+ } else
+ _omap2_clk_disable(clk);
}
#endif
OpenPOWER on IntegriCloud