Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bac282a authored by Ben Dooks's avatar Ben Dooks Committed by Kukjin Kim
Browse files

ARM: SAMSUNG: Add support for pre-sleep/post-restore gpio control 



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: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent c17afc0a

arch/arm/mach-s3c2410/include/mach/pm-core.h

+3 −0
Original line number Diff line number Diff line
@@ -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) { }

arch/arm/mach-s3c64xx/include/mach/pm-core.h

+17 −0
Original line number Diff line number Diff line
@@ -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);

}

arch/arm/mach-s5pv210/include/mach/pm-core.h

+3 −0
Original line number Diff line number Diff line
@@ -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) { }

arch/arm/plat-samsung/pm.c

+2 −0
Original line number Diff line number Diff line
@@ -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();
@@ -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();