aboutsummaryrefslogtreecommitdiff
path: root/arch/blackfin
diff options
context:
space:
mode:
authorSteven Miao <realmz6@gmail.com>2012-06-07 14:25:14 +0800
committerBob Liu <lliubbo@gmail.com>2012-07-24 13:39:50 +0800
commit6b6c37bf9d9295228b63a06b34fea91a02317bce (patch)
treec632d2314e403f2d3ceb3e8612fe6dbc35a536bf /arch/blackfin
parent923680cbee19bf7be11c3ec3ad6e5c14c4aa2194 (diff)
downloadlinux-linaro-stable-6b6c37bf9d9295228b63a06b34fea91a02317bce.tar.gz
bf60x: pm: pass wakeup param
Pass wake up source mask and wakeup source polarity to deepsleep and hibernate. Signed-off-by: Steven Miao <realmz6@gmail.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/mach-bf609/pm.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/arch/blackfin/mach-bf609/pm.c b/arch/blackfin/mach-bf609/pm.c
index 4f6977762630..8d815e057100 100644
--- a/arch/blackfin/mach-bf609/pm.c
+++ b/arch/blackfin/mach-bf609/pm.c
@@ -182,18 +182,18 @@ void bfin_hibernate_syscontrol(void)
asmlinkage void enter_deepsleep(void);
__attribute__((l1_text))
-void bfin_deepsleep(unsigned long mask)
+void bfin_deepsleep(unsigned long mask, unsigned long pol_mask)
{
- bfin_write32(DPM0_WAKE_EN, 0x10);
- bfin_write32(DPM0_WAKE_POL, 0x10);
+ bfin_write32(DPM0_WAKE_EN, mask);
+ bfin_write32(DPM0_WAKE_POL, pol_mask);
SSYNC();
enter_deepsleep();
}
-void bfin_hibernate(unsigned long mask)
+void bfin_hibernate(unsigned long mask, unsigned long pol_mask)
{
- bfin_write32(DPM0_WAKE_EN, 0x10);
- bfin_write32(DPM0_WAKE_POL, 0x10);
+ bfin_write32(DPM0_WAKE_EN, mask);
+ bfin_write32(DPM0_WAKE_POL, pol_mask);
bfin_write32(DPM0_PGCNTR, 0x0000FFFF);
bfin_write32(DPM0_HIB_DIS, 0xFFFF);
@@ -270,9 +270,9 @@ void bf609_cpu_pm_enter(suspend_state_t state)
printk(KERN_DEBUG "Unable to get irq wake\n");
if (state == PM_SUSPEND_STANDBY)
- bfin_deepsleep(wakeup);
+ bfin_deepsleep(wakeup, wakeup_pol);
else {
- bfin_hibernate(wakeup);
+ bfin_hibernate(wakeup, wakeup_pol);
}
}
@@ -294,9 +294,10 @@ static struct bfin_cpu_pm_fns bf609_cpu_pm = {
};
#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
-static void smc_pm_syscore_suspend(void)
+static int smc_pm_syscore_suspend(void)
{
bf609_nor_flash_exit();
+ return 0;
}
static void smc_pm_syscore_resume(void)