Skip to content

Commit 2725d70

Browse files
claudiubeznealdesroches
authored andcommitted
ARM: at91: pm: do not disable/enable PLLA for ULP modes
There is no need to disable/enable PLLA when switching to one of the ULP modes. The PLLA consumers should take care of this. Signed-off-by: Claudiu Beznea <[email protected]> Signed-off-by: Alexandre Belloni <[email protected]> Signed-off-by: Ludovic Desroches <[email protected]>
1 parent bc0779b commit 2725d70

File tree

1 file changed

+0
-31
lines changed

1 file changed

+0
-31
lines changed

arch/arm/mach-at91/pm_suspend.S

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,6 @@ tmp2 .req r5
5050
beq 1b
5151
.endm
5252

53-
/*
54-
* Wait until PLLA has locked.
55-
*/
56-
.macro wait_pllalock
57-
1: ldr tmp1, [pmc, #AT91_PMC_SR]
58-
tst tmp1, #AT91_PMC_LOCKA
59-
beq 1b
60-
.endm
61-
6253
/*
6354
* Put the processor to enter the idle state
6455
*/
@@ -351,14 +342,6 @@ ENTRY(at91_ulp_mode)
351342

352343
wait_mckrdy
353344

354-
/* Save PLLA setting and disable it */
355-
ldr tmp1, [pmc, #AT91_CKGR_PLLAR]
356-
str tmp1, .saved_pllar
357-
358-
mov tmp1, #AT91_PMC_PLLCOUNT
359-
orr tmp1, tmp1, #(1 << 29) /* bit 29 always set */
360-
str tmp1, [pmc, #AT91_CKGR_PLLAR]
361-
362345
ldr r0, .pm_mode
363346
cmp r0, #AT91_PM_ULP1
364347
beq ulp1_mode
@@ -373,18 +356,6 @@ ulp1_mode:
373356
ulp_exit:
374357
ldr pmc, .pmc_base
375358

376-
/* Restore PLLA setting */
377-
ldr tmp1, .saved_pllar
378-
str tmp1, [pmc, #AT91_CKGR_PLLAR]
379-
380-
tst tmp1, #(AT91_PMC_MUL & 0xff0000)
381-
bne 3f
382-
tst tmp1, #(AT91_PMC_MUL & ~0xff0000)
383-
beq 4f
384-
3:
385-
wait_pllalock
386-
4:
387-
388359
/*
389360
* Restore master clock setting
390361
*/
@@ -537,8 +508,6 @@ ENDPROC(at91_sramc_self_refresh)
537508
.word 0
538509
.saved_mckr:
539510
.word 0
540-
.saved_pllar:
541-
.word 0
542511
.saved_sam9_lpr:
543512
.word 0
544513
.saved_sam9_lpr1:

0 commit comments

Comments
 (0)