diff options
author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:46:20 +0800 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:46:20 +0800 |
commit | 69dfdeda6fc58bdb29324250d8f90f4712853c11 (patch) | |
tree | 2acf1aab232f67056e7e7cc679b8b44dbbb0dfed /arch/arm/mach-ux500/pm/suspend.c | |
parent | d9357d6650ce38ca31d0cfdbcb041ebc32f10f26 (diff) | |
parent | ca2d9e858b38d71a97b535b0dca41fe02dae7a0b (diff) |
Merge topic branch 'pm-android' into integration-android-ux500
Diffstat (limited to 'arch/arm/mach-ux500/pm/suspend.c')
-rw-r--r-- | arch/arm/mach-ux500/pm/suspend.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/pm/suspend.c b/arch/arm/mach-ux500/pm/suspend.c index df527964182..9dd4d86a2f3 100644 --- a/arch/arm/mach-ux500/pm/suspend.c +++ b/arch/arm/mach-ux500/pm/suspend.c @@ -76,6 +76,8 @@ static int suspend(bool do_deepsleep) prcmu_enable_wakeups(PRCMU_WAKEUP(ABB)); #endif + ux500_suspend_dbg_test_set_wakeup(); + context_vape_save(); context_fsmc_save(); @@ -258,6 +260,8 @@ static void ux500_suspend_end(void) (void) prcmu_qos_update_requirement(PRCMU_QOS_ARM_OPP, "suspend", 25); suspend_state = PM_SUSPEND_ON; + + ux500_suspend_dbg_end(); } static struct platform_suspend_ops ux500_suspend_ops = { |