summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMahesh Mahadevan <r9aadq@freescale.com>2011-12-16 06:39:38 -0600
committerMahesh Mahadevan <r9aadq@freescale.com>2011-12-19 05:37:49 -0600
commit579102eba5900dc2853d8a906a30cf1440c1ebaf (patch)
tree4d6648dea5440226df78b1f1dd29707a2d5c3ac1 /arch
parent1fa5a7daacec25f2ff045055e2e53c4a9e26c1ff (diff)
ENGR00170508 Need to zero REG_BYPASS_CNT on exit from STOP mode
Per e-mail from design team, the count needs to be zeroed and reconfigured on exit from low power mode Signed-off-by: Mahesh Mahadevan <r9aadq@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-mx6/pm.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-mx6/pm.c b/arch/arm/mach-mx6/pm.c
index bdf337144554..381cc1d7a573 100644
--- a/arch/arm/mach-mx6/pm.c
+++ b/arch/arm/mach-mx6/pm.c
@@ -161,6 +161,10 @@ static void mx6_suspend_restore(void)
/* restore settings after suspend */
__raw_writel(anatop[0], anatop_base + ANATOP_REG_2P5_OFFSET);
__raw_writel(anatop[1], anatop_base + ANATOP_REG_CORE_OFFSET);
+ /* Per spec, the count needs to be zeroed and reconfigured on exit from
+ * low power mode
+ */
+ __raw_writel(ccm_ccr & ~MXC_CCM_CCR_REG_BYPASS_CNT_MASK, MXC_CCM_CCR);
udelay(50);
__raw_writel(ccm_ccr, MXC_CCM_CCR);
__raw_writel(ccm_clpcr, MXC_CCM_CLPCR);