[PATCH 1/2] AT91 slow-clock suspend: don't wait when turning PLLs off

Anders Larsen al at alarsen.net
Wed Mar 3 16:33:29 EST 2010


From: Julien Langer <julien.langer at gmail.com>

AT91: when turning off the PLLs during suspend, don't wait for the lock flag
to be set. Previously the code would always run into the loop limitation
of 1000 iterations because the flag is never set when turning the PLLs off.

Signed-off-by: Julien Langer <julien.langer at gmail.com>
Signed-off-by: Anders Larsen <al at alarsen.net>
Cc: Andrew Victor <avictor.za at gmail.com>
Cc: Russell King <linux at arm.linux.org.uk>
---
 arch/arm/mach-at91/pm_slowclock.S |    4 ----
 1 file changed, 4 deletions(-)

Index: b/arch/arm/mach-at91/pm_slowclock.S
===================================================================
--- a/arch/arm/mach-at91/pm_slowclock.S
+++ b/arch/arm/mach-at91/pm_slowclock.S
@@ -175,8 +175,6 @@ ENTRY(at91_slow_clock)
 	orr	r3, r3, #(1 << 29)		/* bit 29 always set */
 	str	r3, [r1, #(AT91_CKGR_PLLAR - AT91_PMC)]
 
-	wait_pllalock
-
 	/* Save PLLB setting and disable it */
 	ldr	r3, [r1, #(AT91_CKGR_PLLBR - AT91_PMC)]
 	str	r3, .saved_pllbr
@@ -184,8 +182,6 @@ ENTRY(at91_slow_clock)
 	mov	r3, #AT91_PMC_PLLCOUNT
 	str	r3, [r1, #(AT91_CKGR_PLLBR - AT91_PMC)]
 
-	wait_pllblock
-
 	/* Turn off the main oscillator */
 	ldr	r3, [r1, #(AT91_CKGR_MOR - AT91_PMC)]
 	bic	r3, r3, #AT91_PMC_MOSCEN



More information about the linux-arm-kernel mailing list