Skip to content

Commit

Permalink
ARM: S3C24XX: move s3c2416 irq init to common irq code
Browse files Browse the repository at this point in the history
This is needed to further clean up the irq init.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  • Loading branch information
Heiko Stuebner authored and Kukjin Kim committed Feb 3, 2013
1 parent b4a343e commit ef602eb
Show file tree
Hide file tree
Showing 4 changed files with 310 additions and 349 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-s3c24xx/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ obj-$(CONFIG_S3C2412_DMA) += dma-s3c2412.o
obj-$(CONFIG_S3C2412_PM) += pm-s3c2412.o
obj-$(CONFIG_S3C2412_PM_SLEEP) += sleep-s3c2412.o

obj-$(CONFIG_CPU_S3C2416) += s3c2416.o irq-s3c2416.o clock-s3c2416.o
obj-$(CONFIG_CPU_S3C2416) += s3c2416.o clock-s3c2416.o
obj-$(CONFIG_S3C2416_PM) += pm-s3c2416.o

obj-$(CONFIG_CPU_S3C2440) += s3c2440.o irq-s3c2440.o clock-s3c2440.o
Expand Down
23 changes: 23 additions & 0 deletions arch/arm/mach-s3c24xx/irq-pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,26 @@ struct syscore_ops s3c24xx_irq_syscore_ops = {
.suspend = s3c24xx_irq_suspend,
.resume = s3c24xx_irq_resume,
};

#ifdef CONFIG_CPU_S3C2416
static struct sleep_save s3c2416_irq_save[] = {
SAVE_ITEM(S3C2416_INTMSK2),
};

static int s3c2416_irq_suspend(void)
{
s3c_pm_do_save(s3c2416_irq_save, ARRAY_SIZE(s3c2416_irq_save));

return 0;
}

static void s3c2416_irq_resume(void)
{
s3c_pm_do_restore(s3c2416_irq_save, ARRAY_SIZE(s3c2416_irq_save));
}

struct syscore_ops s3c2416_irq_syscore_ops = {
.suspend = s3c2416_irq_suspend,
.resume = s3c2416_irq_resume,
};
#endif
348 changes: 0 additions & 348 deletions arch/arm/mach-s3c24xx/irq-s3c2416.c

This file was deleted.

Loading

0 comments on commit ef602eb

Please sign in to comment.