浏览代码

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>
Patrice Vilchez 10 年之前
父节点
当前提交
5957457a2d
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      arch/arm/mach-at91/pm_slowclock.S

+ 2 - 0
arch/arm/mach-at91/pm_slowclock.S

@@ -205,6 +205,7 @@ sdr_sr_done:
 	/* Turn off the main oscillator */
 	/* Turn off the main oscillator */
 	ldr	tmp1, [pmc, #AT91_CKGR_MOR]
 	ldr	tmp1, [pmc, #AT91_CKGR_MOR]
 	bic	tmp1, tmp1, #AT91_PMC_MOSCEN
 	bic	tmp1, tmp1, #AT91_PMC_MOSCEN
+	orr	tmp1, tmp1, #AT91_PMC_KEY
 	str	tmp1, [pmc, #AT91_CKGR_MOR]
 	str	tmp1, [pmc, #AT91_CKGR_MOR]
 
 
 	/* Wait for interrupt */
 	/* Wait for interrupt */
@@ -213,6 +214,7 @@ sdr_sr_done:
 	/* Turn on the main oscillator */
 	/* Turn on the main oscillator */
 	ldr	tmp1, [pmc, #AT91_CKGR_MOR]
 	ldr	tmp1, [pmc, #AT91_CKGR_MOR]
 	orr	tmp1, tmp1, #AT91_PMC_MOSCEN
 	orr	tmp1, tmp1, #AT91_PMC_MOSCEN
+	orr	tmp1, tmp1, #AT91_PMC_KEY
 	str	tmp1, [pmc, #AT91_CKGR_MOR]
 	str	tmp1, [pmc, #AT91_CKGR_MOR]
 
 
 	wait_moscrdy
 	wait_moscrdy