ARM: S3C24XX: modify s3c2443 irq init to initialize all irqs
From: Heiko Stuebner <heiko@...> Date: Sat, 17 Nov 2012 18:02:21 +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 s3c2443_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-smdk2443.c | 2 +- arch/arm/plat-s3c24xx/irq.c | 22 ++++------------------ arch/arm/plat-samsung/include/plat/s3c2443.h | 2 ++ 3 files changed, 7 insertions(+), 19 deletions(-)
Statistics
- 7 lines added
- 19 lines removed
Changes
-------------------- arch/arm/mach-s3c24xx/mach-smdk2443.c ---------------------
index c6d1a03..8b65a54 100644
@@ -140,7 +140,7 @@ MACHINE_START(SMDK2443, "SMDK2443")
/* Maintainer: Ben Dooks <ben-linux@fluff.org> */
.atag_offset = 0x100,
+ .init_irq = s3c2443_init_irq,
.map_io = smdk2443_map_io,
.init_machine = smdk2443_machine_init,
.timer = &s3c24xx_timer,
------------------------- arch/arm/plat-s3c24xx/irq.c --------------------------
index 0a051eb..4cf3c13 100644
@@ -935,10 +935,11 @@ static int s3c2443_add_sub(unsigned int base,
return 0;
}
+void __init s3c2443_init_irq(void)
{
+ pr_info("S3C2443: IRQ Support\n");
+
+ s3c24xx_init_irq();
s3c2443_add_sub(IRQ_CAM, s3c2443_irq_demux_cam, &s3c2443_irq_cam,
IRQ_S3C2440_CAM_C, IRQ_S3C2440_CAM_P);
@@ -956,20 +957,5 @@ static int s3c2443_irq_add(struct device *dev,
s3c2443_add_sub(IRQ_WDT, s3c2443_irq_demux_wdtac97,
&s3c2443_irq_wdtac97,
IRQ_S3C2443_WDT, IRQ_S3C2443_AC97);
}
#endif
----------------- arch/arm/plat-samsung/include/plat/s3c2443.h -----------------
index a5b794f..71b88ec 100644
@@ -25,6 +25,8 @@ extern void s3c2443_init_clocks(int xtal);
extern int s3c2443_baseclk_add(void);
extern void s3c2443_restart(char mode, const char *cmd);
+
+extern void s3c2443_init_irq(void);
#else
#define s3c2443_init_clocks NULL
#define s3c2443_init_uarts NULL