Skip to content

Commit

Permalink
ARM: SAMSUNG: Add support for pre-sleep/post-restore gpio control
Browse files Browse the repository at this point in the history
Add a callback so that per-arch can do pre-sleep and post-resume
gpio configuration so that for the S3C64XX, the GPIO configuration
is restored before the sleep mode is cleared.

For the S3C64XX case, it means that the GPIOs get set back to normal
operation after the restore code puts the original configurations
back in after the

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  • Loading branch information
Ben Dooks authored and Kukjin Kim committed Jul 20, 2011
1 parent c17afc0 commit 1bac282
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 0 deletions.
3 changes: 3 additions & 0 deletions arch/arm/mach-s3c2410/include/mach/pm-core.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,6 @@ static inline void s3c_pm_arch_update_uart(void __iomem *regs,
struct pm_uart_save *save)
{
}

static inline void s3c_pm_restored_gpios(void) { }
static inline void s3c_pm_saved_gpios(void) { }
17 changes: 17 additions & 0 deletions arch/arm/mach-s3c64xx/include/mach/pm-core.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,20 @@ static inline void s3c_pm_arch_update_uart(void __iomem *regs,
save->ucon = new_ucon;
}
}

static inline void s3c_pm_restored_gpios(void)
{
/* ensure sleep mode has been cleared from the system */

__raw_writel(0, S3C64XX_SLPEN);
}

static inline void s3c_pm_saved_gpios(void)
{
/* turn on the sleep mode and keep it there, as it seems that during
* suspend the xCON registers get re-set and thus you can end up with
* problems between going to sleep and resuming.
*/

__raw_writel(S3C64XX_SLPEN_USE_xSLP, S3C64XX_SLPEN);
}
3 changes: 3 additions & 0 deletions arch/arm/mach-s5pv210/include/mach/pm-core.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@ static inline void s3c_pm_arch_update_uart(void __iomem *regs,
{
/* nothing here yet */
}

static inline void s3c_pm_restored_gpios(void) { }
static inline void s3c_pm_saved_gpios(void) { }
2 changes: 2 additions & 0 deletions arch/arm/plat-samsung/pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ static int s3c_pm_enter(suspend_state_t state)
/* save all necessary core registers not covered by the drivers */

s3c_pm_save_gpios();
s3c_pm_saved_gpios();
s3c_pm_save_uarts();
s3c_pm_save_core();

Expand Down Expand Up @@ -309,6 +310,7 @@ static int s3c_pm_enter(suspend_state_t state)
s3c_pm_restore_core();
s3c_pm_restore_uarts();
s3c_pm_restore_gpios();
s3c_pm_restored_gpios();

s3c_pm_debug_init();

Expand Down

0 comments on commit 1bac282

Please sign in to comment.