Commit 8463e20a authored by Tero Kristo's avatar Tero Kristo Committed by Russell King

[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: default avatarTero Kristo <tero.kristo@nokia.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0eafd472
...@@ -1000,6 +1000,10 @@ void omap2_clk_disable_unused(struct clk *clk) ...@@ -1000,6 +1000,10 @@ void omap2_clk_disable_unused(struct clk *clk)
return; return;
printk(KERN_INFO "Disabling unused clock \"%s\"\n", clk->name); printk(KERN_INFO "Disabling unused clock \"%s\"\n", clk->name);
if (cpu_is_omap34xx()) {
omap2_clk_enable(clk);
omap2_clk_disable(clk);
} else
_omap2_clk_disable(clk); _omap2_clk_disable(clk);
} }
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment