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

From: Anders Larsen
Date: Wed Mar 03 2010 - 17:03:13 EST


From: Julien Langer <julien.langer@xxxxxxxxx>

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@xxxxxxxxx>
Signed-off-by: Anders Larsen <al@xxxxxxxxxxx>
Cc: Andrew Victor <avictor.za@xxxxxxxxx>
Cc: Russell King <linux@xxxxxxxxxxxxxxxx>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/