Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 317aa408 authored by Anders Larsen's avatar Anders Larsen Committed by Russell King
Browse files

ARM: 5975/1: AT91 slow-clock suspend: don't wait when turning PLLs off 

From: Julien Langer <julien.langer@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.

Comments from Anders Larsen:

 (in http://marc.info/?l=linux-kernel&m=127058929724193&w=2

)

Signed-off-by: default avatarJulien Langer <julien.langer@gmail.com>
Signed-off-by: default avatarAnders Larsen <al@alarsen.net>
Acked-by: default avatarAndrew Victor <linux@maxim.org.za>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 2ba3abd8

arch/arm/mach-at91/pm_slowclock.S

+0 −4
Original line number Diff line number Diff line
@@ -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