diff options
| author | Patrice Vilchez <patrice.vilchez@atmel.com> | 2015-02-12 10:52:13 +0800 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-03-05 11:43:02 +0100 |
| commit | 5957457a2d96e4c9b2fecd40f29cdb3bb841d75e (patch) | |
| tree | a47c2dc2e699e10706a728c5b7b600b8520cc854 /arch/arm/mach-at91 | |
| parent | db68e71a0e3726573999b1930d20bc30232cea6e (diff) | |
| download | linux-stable-5957457a2d96e4c9b2fecd40f29cdb3bb841d75e.tar.gz linux-stable-5957457a2d96e4c9b2fecd40f29cdb3bb841d75e.tar.bz2 linux-stable-5957457a2d96e4c9b2fecd40f29cdb3bb841d75e.zip | |
ARM: at91/pm: MOR register KEY was missing
Because writing the MOR register requires the PASSWD(0x37),
if missed, the write operation will be aborted.
Signed-off-by: Patrice Vilchez <patrice.vilchez@atmel.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91')
| -rw-r--r-- | arch/arm/mach-at91/pm_slowclock.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/pm_slowclock.S b/arch/arm/mach-at91/pm_slowclock.S index a2cc49f96f61..8ab80e579be0 100644 --- a/arch/arm/mach-at91/pm_slowclock.S +++ b/arch/arm/mach-at91/pm_slowclock.S @@ -205,6 +205,7 @@ sdr_sr_done: /* Turn off the main oscillator */ ldr tmp1, [pmc, #AT91_CKGR_MOR] bic tmp1, tmp1, #AT91_PMC_MOSCEN + orr tmp1, tmp1, #AT91_PMC_KEY str tmp1, [pmc, #AT91_CKGR_MOR] /* Wait for interrupt */ @@ -213,6 +214,7 @@ sdr_sr_done: /* Turn on the main oscillator */ ldr tmp1, [pmc, #AT91_CKGR_MOR] orr tmp1, tmp1, #AT91_PMC_MOSCEN + orr tmp1, tmp1, #AT91_PMC_KEY str tmp1, [pmc, #AT91_CKGR_MOR] wait_moscrdy |