diff options
| author | ramesh.chandrasekaran <ramesh.chandrasekaran@stericsson.com> | 2012-05-23 14:14:00 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-25 08:35:13 +0200 |
| commit | aec28c223d49999c3dff7c668ba8b32c7fab3d1b (patch) | |
| tree | a4375ddcf46772b5bd7f38f9774110d01cfa919f | |
| parent | 91660ea903d5b4bfddb7e72df5539e5b054ec19d (diff) | |
pm: Fix for Ethernet doesn't work after suspend
Signed-off-by: ramesh.chandrasekaran <ramesh.chandrasekaran@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/context.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/pm/context.c | 23 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/pm/suspend.c | 4 |
3 files changed, 30 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/include/mach/context.h b/arch/arm/mach-ux500/include/mach/context.h index 6975a69eddc..a3490121b67 100644 --- a/arch/arm/mach-ux500/include/mach/context.h +++ b/arch/arm/mach-ux500/include/mach/context.h @@ -36,6 +36,9 @@ int context_arm_notifier_unregister(struct notifier_block *nb); void context_vape_save(void); void context_vape_restore(void); +void context_fsmc_save(void); +void context_fsmc_restore(void); + void context_gpio_save(void); void context_gpio_restore(void); void context_gpio_restore_mux(void); diff --git a/arch/arm/mach-ux500/pm/context.c b/arch/arm/mach-ux500/pm/context.c index 01040b6202f..9dbbc9a7fdd 100644 --- a/arch/arm/mach-ux500/pm/context.c +++ b/arch/arm/mach-ux500/pm/context.c @@ -193,6 +193,8 @@ static u32 gpio_bankaddr[GPIO_NUM_BANKS] = {IO_ADDRESS(U8500_GPIOBANK0_BASE), static u32 gpio_save[GPIO_NUM_BANKS][GPIO_NUM_SAVE_REGISTERS]; +void __iomem *fsmc_base_addr; +static u32 fsmc_bcr0; /* * Stacks and stack pointers */ @@ -634,6 +636,26 @@ void context_vape_restore(void) } /* + * Save FSMC registers that will be reset + * during power save. + */ +void context_fsmc_save(void) +{ + fsmc_base_addr = ioremap_nocache(U8500_FSMC_BASE, 8); + fsmc_bcr0 = readl(fsmc_base_addr); +} + +/* + * Restore FSMC registers that will be reset + * during power save. + */ +void context_fsmc_restore(void) +{ + writel(fsmc_bcr0, fsmc_base_addr); + iounmap(fsmc_base_addr); +} + +/* * Save GPIO registers that might be modified * for power save reasons. */ @@ -650,6 +672,7 @@ void context_gpio_save(void) gpio_save[i][4] = readl(gpio_bankaddr[i] + NMK_GPIO_DAT); gpio_save[i][6] = readl(gpio_bankaddr[i] + NMK_GPIO_SLPC); } + /* Mask GPIO140 and GPIO32 which gives * spurious interrupts during sleep */ diff --git a/arch/arm/mach-ux500/pm/suspend.c b/arch/arm/mach-ux500/pm/suspend.c index 8d3d4729dcd..9dd4d86a2f3 100644 --- a/arch/arm/mach-ux500/pm/suspend.c +++ b/arch/arm/mach-ux500/pm/suspend.c @@ -80,6 +80,8 @@ static int suspend(bool do_deepsleep) context_vape_save(); + context_fsmc_save(); + if (pins_force) { /* * Save GPIO settings before applying power save @@ -142,6 +144,8 @@ static int suspend(bool do_deepsleep) context_vape_restore(); + context_fsmc_restore(); + /* If GPIO woke us up then save the pins that caused the wake up */ ux500_pm_gpio_save_wake_up_status(); |