From 3f681e66d2fe6a07774e9590bec5f5813381b126 Mon Sep 17 00:00:00 2001 From: Sundar R Iyer Date: Wed, 16 Jun 2010 13:04:37 +0530 Subject: ux500-pm: enable the on-board keypad wakeup for sleep/deepsleep states The on-board keypad interfaces through the GPIO218. We make this GPIO wakeup capable in sleep/deep sleep modes ST-Ericsson Change ID: 264368 Signed-off-by: Sundar R Iyer Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/1717 Reviewed-by: Rickard ANDERSSON Signed-off-by: Mian Yousaf Kaukab Change-Id: Idb0eef23188f474c89b43d1eda07755c555fce8d Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2633 Reviewed-by: Jonas ABERG --- arch/arm/mach-ux500/pm.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'arch/arm/mach-ux500/pm.c') diff --git a/arch/arm/mach-ux500/pm.c b/arch/arm/mach-ux500/pm.c index 7ac13b70233..8974f5daa81 100755 --- a/arch/arm/mach-ux500/pm.c +++ b/arch/arm/mach-ux500/pm.c @@ -730,16 +730,6 @@ static int u8500_pm_enter(suspend_state_t state) break; case PM_SUSPEND_MEM: - - /* ROM code addresses to store backup contents */ - /* pass the physical address of back up to ROM code */ - writel(virt_to_phys(ux500_backup_ptr), - IO_ADDRESS(U8500_EXT_BACKUPRAM_ADDR)); - writel(IO_ADDRESS(U8500_BACKUPRAM0_BASE), - IO_ADDRESS(U8500_CPU0_PUBLIC_BACKUP)); - writel(IO_ADDRESS(U8500_BACKUPRAM0_BASE), - IO_ADDRESS(U8500_CPU1_PUBLIC_BACKUP)); - /* core context to be saved */ ux500_save_core_context(); @@ -849,6 +839,15 @@ static int __init u8500_pm_init(void) return -ENOMEM; } + /* ROM code addresses to store backup contents */ + /* pass the physical address of back up to ROM code */ + writel(virt_to_phys(ux500_backup_ptr), + IO_ADDRESS(U8500_EXT_BACKUPRAM_ADDR)); + writel(IO_ADDRESS(U8500_BACKUPRAM0_BASE), + IO_ADDRESS(U8500_CPU0_PUBLIC_BACKUP)); + writel(IO_ADDRESS(U8500_BACKUPRAM0_BASE), + IO_ADDRESS(U8500_CPU1_PUBLIC_BACKUP)); + /* register the global power off hook */ pm_power_off = u8500_pm_poweroff; -- cgit v1.2.3