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

Commit fda22577 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: S3C64XX: PM: Synchronise wakeup mask on suspend 



Use the new wakeup mask synchronisation code to set the
relevant wakeup mask bits.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 0317e52e

arch/arm/mach-s3c64xx/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -7,6 +7,7 @@ 
config PLAT_S3C64XX

config PLAT_S3C64XX

	bool

	bool

	depends on ARCH_S3C64XX

	depends on ARCH_S3C64XX

	select SAMSUNG_WAKEMASK

	default y

	default y

	help

	help

	  Base platform code for any Samsung S3C64XX device

	  Base platform code for any Samsung S3C64XX device

arch/arm/mach-s3c64xx/pm.c

+20 −0
Original line number Original line Diff line number Diff line
@@ -18,8 +18,11 @@ 
#include <linux/io.h>

#include <linux/io.h>





#include <mach/map.h>

#include <mach/map.h>

#include <mach/irqs.h>





#include <plat/pm.h>

#include <plat/pm.h>

#include <plat/wakeup-mask.h>



#include <mach/regs-sys.h>

#include <mach/regs-sys.h>

#include <mach/regs-gpio.h>

#include <mach/regs-gpio.h>

#include <mach/regs-clock.h>

#include <mach/regs-clock.h>
@@ -153,8 +156,25 @@ static void s3c64xx_cpu_suspend(void) 
	panic("sleep resumed to originator?");

	panic("sleep resumed to originator?");

}

}





/* mapping of interrupts to parts of the wakeup mask */

static struct samsung_wakeup_mask wake_irqs[] = {

	{ .irq = IRQ_RTC_ALARM,	.bit = S3C64XX_PWRCFG_RTC_ALARM_DISABLE, },

	{ .irq = IRQ_RTC_TIC,	.bit = S3C64XX_PWRCFG_RTC_TICK_DISABLE, },

	{ .irq = IRQ_PENDN,	.bit = S3C64XX_PWRCFG_TS_DISABLE, },

	{ .irq = IRQ_HSMMC0,	.bit = S3C64XX_PWRCFG_MMC0_DISABLE, },

	{ .irq = IRQ_HSMMC1,	.bit = S3C64XX_PWRCFG_MMC1_DISABLE, },

	{ .irq = IRQ_HSMMC2,	.bit = S3C64XX_PWRCFG_MMC2_DISABLE, },

	{ .irq = NO_WAKEUP_IRQ,	.bit = S3C64XX_PWRCFG_BATF_DISABLE},

	{ .irq = NO_WAKEUP_IRQ,	.bit = S3C64XX_PWRCFG_MSM_DISABLE },

	{ .irq = NO_WAKEUP_IRQ,	.bit = S3C64XX_PWRCFG_HSI_DISABLE },

	{ .irq = NO_WAKEUP_IRQ,	.bit = S3C64XX_PWRCFG_MSM_DISABLE },

};



static void s3c64xx_pm_prepare(void)

static void s3c64xx_pm_prepare(void)

{

{

	samsung_sync_wakemask(S3C64XX_PWR_CFG,

			      wake_irqs, ARRAY_SIZE(wake_irqs));



	/* store address of resume. */

	/* store address of resume. */

	__raw_writel(virt_to_phys(s3c_cpu_resume), S3C64XX_INFORM0);

	__raw_writel(virt_to_phys(s3c_cpu_resume), S3C64XX_INFORM0);