diff options
author | Patrice Vilchez <patrice.vilchez@atmel.com> | 2015-02-11 21:52:13 -0500 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-03-05 05:43:02 -0500 |
commit | 5957457a2d96e4c9b2fecd40f29cdb3bb841d75e (patch) | |
tree | a47c2dc2e699e10706a728c5b7b600b8520cc854 | |
parent | db68e71a0e3726573999b1930d20bc30232cea6e (diff) |
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>
-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: | |||
205 | /* Turn off the main oscillator */ | 205 | /* Turn off the main oscillator */ |
206 | ldr tmp1, [pmc, #AT91_CKGR_MOR] | 206 | ldr tmp1, [pmc, #AT91_CKGR_MOR] |
207 | bic tmp1, tmp1, #AT91_PMC_MOSCEN | 207 | bic tmp1, tmp1, #AT91_PMC_MOSCEN |
208 | orr tmp1, tmp1, #AT91_PMC_KEY | ||
208 | str tmp1, [pmc, #AT91_CKGR_MOR] | 209 | str tmp1, [pmc, #AT91_CKGR_MOR] |
209 | 210 | ||
210 | /* Wait for interrupt */ | 211 | /* Wait for interrupt */ |
@@ -213,6 +214,7 @@ sdr_sr_done: | |||
213 | /* Turn on the main oscillator */ | 214 | /* Turn on the main oscillator */ |
214 | ldr tmp1, [pmc, #AT91_CKGR_MOR] | 215 | ldr tmp1, [pmc, #AT91_CKGR_MOR] |
215 | orr tmp1, tmp1, #AT91_PMC_MOSCEN | 216 | orr tmp1, tmp1, #AT91_PMC_MOSCEN |
217 | orr tmp1, tmp1, #AT91_PMC_KEY | ||
216 | str tmp1, [pmc, #AT91_CKGR_MOR] | 218 | str tmp1, [pmc, #AT91_CKGR_MOR] |
217 | 219 | ||
218 | wait_moscrdy | 220 | wait_moscrdy |