From: Chaithrika U S Date: Tue, 15 Dec 2009 12:32:58 +0000 (+0530) Subject: davinci: clock: Check CLK_PSC flag before disabling PSC X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=679f9218cac9e7d63ae3868c0c71b45b1ba5f766;p=deliverable%2Flinux.git davinci: clock: Check CLK_PSC flag before disabling PSC Some modules do not have PSC to control their clocks. The 'lpsc' field in the clk structure is 0 for such clocks. In the clock disable function check for CLK PSC flag before disabling the PSC. If this is not taken care of then it may so happen that module controlled by LPSC 0 is erroneously disabled. Signed-off-by: Chaithrika U S Signed-off-by: Kevin Hilman --- diff --git a/arch/arm/mach-davinci/clock.c b/arch/arm/mach-davinci/clock.c index a19bab18318a..123839332d50 100644 --- a/arch/arm/mach-davinci/clock.c +++ b/arch/arm/mach-davinci/clock.c @@ -49,7 +49,8 @@ static void __clk_disable(struct clk *clk) { if (WARN_ON(clk->usecount == 0)) return; - if (--clk->usecount == 0 && !(clk->flags & CLK_PLL)) + if (--clk->usecount == 0 && !(clk->flags & CLK_PLL) && + (clk->flags & CLK_PSC)) davinci_psc_config(psc_domain(clk), clk->gpsc, clk->lpsc, 0); if (clk->parent) __clk_disable(clk->parent);