summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhou Jingyu <b02241@freescale.com>2010-11-08 17:28:58 +0800
committerJustin Waters <justin.waters@timesys.com>2010-12-13 16:10:45 -0500
commit6e118bb8415afdaf733552f900c8f996af6fb53f (patch)
tree74bc1ccbfd566da5311a6f0a73beff09657ac355
parent0f7e710ffdd78e81e633cb01f0130f1756db1edc (diff)
ENGR00133377 mx28: fix system suspend twice issue
fix issue: system would enter suspend twice instead of resume when press pwr key twice Signed-off-by: Zhou Jingyu <Jingyu.Zhou@freescale.com>
-rw-r--r--arch/arm/mach-mx28/pm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mx28/pm.c b/arch/arm/mach-mx28/pm.c
index 2d1d0afc2847..c6490d0e3e6d 100644
--- a/arch/arm/mach-mx28/pm.c
+++ b/arch/arm/mach-mx28/pm.c
@@ -141,6 +141,8 @@ static inline void do_standby(void)
saved_sleep_state = 0; /* waking from standby */
__raw_writel(BM_POWER_CTRL_PSWITCH_IRQ,
REGS_POWER_BASE + HW_POWER_CTRL_CLR);
+ __raw_writel(BM_POWER_CTRL_ENIRQ_PSWITCH,
+ REGS_POWER_BASE + HW_POWER_CTRL_SET);
local_fiq_enable();
@@ -292,8 +294,6 @@ static void pswitch_check_work(struct work_struct *work)
}
__raw_writel(BM_POWER_CTRL_PSWITCH_IRQ,
REGS_POWER_BASE + HW_POWER_CTRL_CLR);
- __raw_writel(BM_POWER_CTRL_ENIRQ_PSWITCH,
- REGS_POWER_BASE + HW_POWER_CTRL_SET);
__raw_writel(BM_POWER_CTRL_PSWITCH_IRQ,
REGS_POWER_BASE + HW_POWER_CTRL_CLR);
}