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

Commit d8fdec16 authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Kukjin Kim
Browse files

ARM: S3C24XX: Move irq syscore-ops to irq-pm 



With this the definition of s3c24xx_irq_syscore_ops can also move to
common.h from plat/pm.h and the definitions of s3c24xx_irq_suspend
and s3c24xx_irq_resume are also not necessary anymore in plat/pm.h

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 1f629b7a

arch/arm/mach-s3c24xx/common.h

+2 −0
Original line number Diff line number Diff line
@@ -15,4 +15,6 @@ 
void s3c2410_restart(char mode, const char *cmd);

void s3c244x_restart(char mode, const char *cmd);



extern struct syscore_ops s3c24xx_irq_syscore_ops;



#endif /* __ARCH_ARM_MACH_S3C24XX_COMMON_H */

arch/arm/mach-s3c24xx/irq-pm.c

+8 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/module.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/syscore_ops.h>



#include <plat/cpu.h>

#include <plat/pm.h>
@@ -64,7 +65,7 @@ static unsigned long save_extint[3]; 
static unsigned long save_eintflt[4];

static unsigned long save_eintmask;



int s3c24xx_irq_suspend(void)

static int s3c24xx_irq_suspend(void)

{

	unsigned int i;
@@ -80,7 +81,7 @@ int s3c24xx_irq_suspend(void) 
	return 0;

}



void s3c24xx_irq_resume(void)

static void s3c24xx_irq_resume(void)

{

	unsigned int i;
@@ -93,3 +94,8 @@ void s3c24xx_irq_resume(void) 
	s3c_pm_do_restore(irq_save, ARRAY_SIZE(irq_save));

	__raw_writel(save_eintmask, S3C24XX_EINTMASK);

}



struct syscore_ops s3c24xx_irq_syscore_ops = {

	.suspend	= s3c24xx_irq_suspend,

	.resume		= s3c24xx_irq_resume,

};

arch/arm/mach-s3c24xx/s3c2410.c

+3 −1
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ 
#include <plat/gpio-cfg.h>

#include <plat/gpio-cfg-helpers.h>



#include "common.h"



/* Initial IO mappings */



static struct map_desc s3c2410_iodesc[] __initdata = {
@@ -182,8 +184,8 @@ int __init s3c2410_init(void) 


#ifdef CONFIG_PM

	register_syscore_ops(&s3c2410_pm_syscore_ops);

#endif

	register_syscore_ops(&s3c24xx_irq_syscore_ops);

#endif



	return device_register(&s3c2410_dev);

}

arch/arm/mach-s3c24xx/s3c2412.c

+2 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include <plat/regs-spi.h>

#include <plat/s3c2412.h>



#include "common.h"

#include "regs-dsc.h"



#define S3C2412_SWRST			(S3C24XX_VA_CLKPWR + 0x30)
@@ -245,8 +246,8 @@ int __init s3c2412_init(void) 


#ifdef CONFIG_PM

	register_syscore_ops(&s3c2412_pm_syscore_ops);

#endif

	register_syscore_ops(&s3c24xx_irq_syscore_ops);

#endif



	return device_register(&s3c2412_dev);

}

arch/arm/mach-s3c24xx/s3c2416.c

+3 −1
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ 
#include <plat/rtc-core.h>

#include <plat/spi-core.h>



#include "common.h"



static struct map_desc s3c2416_iodesc[] __initdata = {

	IODESC_ENT(WATCHDOG),

	IODESC_ENT(CLKPWR),
@@ -105,9 +107,9 @@ int __init s3c2416_init(void) 


#ifdef CONFIG_PM

	register_syscore_ops(&s3c2416_pm_syscore_ops);

#endif

	register_syscore_ops(&s3c24xx_irq_syscore_ops);

	register_syscore_ops(&s3c2416_irq_syscore_ops);

#endif



	return device_register(&s3c2416_dev);

}