summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPawel Szyszuk <pawel.szyszuk@stericsson.com>2011-10-28 13:25:43 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 10:59:20 +0200
commitf6a20dd13d85196d2fd4f5a00c393c164bd99a62 (patch)
tree8ff63c282f551b8fdb67eea5c39b1790015fa8e0
parent75d8608338d7c94303ed8a0d02ee3ef0e027b29d (diff)
ARM: U9500: Add wake-up support for ST-E HSI
ST-Ericsson ID: 365660 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I45b961a3fbdcb0e1944aad54621cede2e91e3c48 Signed-off-by: Pawel Szyszuk <pawel.szyszuk@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/36087 Reviewed-by: Andrew LYNN <andrew.lynn@stericsson.com>
-rw-r--r--arch/arm/mach-ux500/pm/suspend.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/pm/suspend.c b/arch/arm/mach-ux500/pm/suspend.c
index 3a6437e421b..1eae45d5f45 100644
--- a/arch/arm/mach-ux500/pm/suspend.c
+++ b/arch/arm/mach-ux500/pm/suspend.c
@@ -19,6 +19,7 @@
#include <mach/context.h>
#include <mach/pm.h>
+#include <mach/id.h>
#include "suspend_dbg.h"
@@ -67,7 +68,10 @@ static int suspend(bool do_deepsleep)
nmk_gpio_wakeups_suspend();
/* configure the prcm for a sleep wakeup */
- prcmu_enable_wakeups(PRCMU_WAKEUP(ABB));
+ if (cpu_is_u9500())
+ prcmu_enable_wakeups(PRCMU_WAKEUP(ABB) | PRCMU_WAKEUP(HSI0));
+ else
+ prcmu_enable_wakeups(PRCMU_WAKEUP(ABB));
context_vape_save();
@@ -151,8 +155,12 @@ exit:
}
/* This is what cpuidle wants */
- prcmu_enable_wakeups(PRCMU_WAKEUP(ARM) | PRCMU_WAKEUP(RTC) |
- PRCMU_WAKEUP(ABB));
+ if (cpu_is_u9500())
+ prcmu_enable_wakeups(PRCMU_WAKEUP(ARM) | PRCMU_WAKEUP(RTC) |
+ PRCMU_WAKEUP(ABB) | PRCMU_WAKEUP(HSI0));
+ else
+ prcmu_enable_wakeups(PRCMU_WAKEUP(ARM) | PRCMU_WAKEUP(RTC) |
+ PRCMU_WAKEUP(ABB));
nmk_gpio_wakeups_resume();