ARM: S3C24XX: modify s3c2416 irq init to initialize all irqs
From: Heiko Stuebner <heiko@...> Date: Sat, 17 Nov 2012 15:55:56 +0100
Commit-Message
Previously the irq init used s3c24xx_init_irq and an additional arch_initcall to add the cpu specific irqs. To be able to simplyfy the irq init later, create a new function s3c416_init_irq, which then calls s3c24xx_init_irq but also adds the cpu specific irqs. Signed-off-by: Heiko Stuebner <heiko@...>
Patch-Comment
arch/arm/mach-s3c24xx/mach-smdk2416.c | 2 +- arch/arm/plat-s3c24xx/irq.c | 22 ++++------------------ arch/arm/plat-samsung/include/plat/s3c2416.h | 1 + 3 files changed, 6 insertions(+), 19 deletions(-)
Statistics
- 6 lines added
- 19 lines removed
Changes
-------------------- arch/arm/mach-s3c24xx/mach-smdk2416.c ---------------------
index f30d7fc..5f6858f 100644
@@ -251,7 +251,7 @@ MACHINE_START(SMDK2416, "SMDK2416")
/* Maintainer: Yauhen Kharuzhy <jekhor@gmail.com> */
.atag_offset = 0x100,
+ .init_irq = s3c2416_init_irq,
.map_io = smdk2416_map_io,
.init_machine = smdk2416_machine_init,
.timer = &s3c24xx_timer,
------------------------- arch/arm/plat-s3c24xx/irq.c --------------------------
index febbe2c..ca60486 100644
@@ -1009,10 +1009,11 @@ static void s3c2416_irq_add_second(void)
}
}
+void __init s3c2416_init_irq(void)
{
+ pr_info("S3C2416: IRQ Support\n");
+
+ s3c24xx_init_irq();
s3c2416_add_sub(IRQ_LCD, s3c2416_irq_demux_lcd, &s3c2416_irq_lcd,
IRQ_S3C2443_LCD2, IRQ_S3C2443_LCD4);
@@ -1029,23 +1030,8 @@ static int s3c2416_irq_add(struct device *dev,
IRQ_S3C2443_WDT, IRQ_S3C2443_AC97);
s3c2416_irq_add_second();
}
#ifdef CONFIG_PM
static struct sleep_save irq2_save[] = {
SAVE_ITEM(S3C2416_INTMSK2),
----------------- arch/arm/plat-samsung/include/plat/s3c2416.h -----------------
index 7178e33..f27399a 100644
@@ -25,6 +25,7 @@ extern int s3c2416_baseclk_add(void);
extern void s3c2416_restart(char mode, const char *cmd);
+extern void s3c2416_init_irq(void);
extern struct syscore_ops s3c2416_irq_syscore_ops;
#else