hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARM: S3C24XX: modify s3c2416 irq init to initialize all irqs 

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@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
Heiko Stuebner 2013-01-29 10:25:22 -08:00 committed by Kukjin Kim
parent ef602eb53c
commit 4a282dd3b6
3 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-s3c24xx/mach-smdk2416.c
View File

@ -250,7 +250,7 @@ MACHINE_START(SMDK2416, "SMDK2416")
/* Maintainer: Yauhen Kharuzhy <jekhor@gmail.com> */ /* Maintainer: Yauhen Kharuzhy <jekhor@gmail.com> */
.atag_offset = 0x100, .atag_offset = 0x100,
.init_irq = s3c24xx_init_irq, .init_irq = s3c2416_init_irq,
.map_io = smdk2416_map_io, .map_io = smdk2416_map_io,
.init_machine = smdk2416_machine_init, .init_machine = smdk2416_machine_init,
.timer = &s3c24xx_timer, .timer = &s3c24xx_timer,

22
arch/arm/plat-s3c24xx/irq.c
View File

@ -874,10 +874,11 @@ static void s3c2416_irq_add_second(void)
} }
} }
static int s3c2416_irq_add(struct device *dev, void __init s3c2416_init_irq(void)
struct subsys_interface *sif)
{ {
printk(KERN_INFO "S3C2416: IRQ Support\n"); pr_info("S3C2416: IRQ Support\n");
s3c24xx_init_irq();
s3c2416_add_sub(IRQ_LCD, s3c2416_irq_demux_lcd, &s3c2416_irq_lcd, s3c2416_add_sub(IRQ_LCD, s3c2416_irq_demux_lcd, &s3c2416_irq_lcd,
IRQ_S3C2443_LCD2, IRQ_S3C2443_LCD4); IRQ_S3C2443_LCD2, IRQ_S3C2443_LCD4);
@ -894,21 +895,6 @@ static int s3c2416_irq_add(struct device *dev,
IRQ_S3C2443_WDT, IRQ_S3C2443_AC97); IRQ_S3C2443_WDT, IRQ_S3C2443_AC97);
s3c2416_irq_add_second(); s3c2416_irq_add_second();
return 0;
} }
static struct subsys_interface s3c2416_irq_interface = {
.name = "s3c2416_irq",
.subsys = &s3c2416_subsys,
.add_dev = s3c2416_irq_add,
};
static int __init s3c2416_irq_init(void)
{
return subsys_interface_register(&s3c2416_irq_interface);
}
arch_initcall(s3c2416_irq_init);
#endif #endif

1
arch/arm/plat-samsung/include/plat/s3c2416.h
View File

@ -25,6 +25,7 @@ extern int s3c2416_baseclk_add(void);
extern void s3c2416_restart(char mode, const char *cmd); extern void s3c2416_restart(char mode, const char *cmd);
extern void s3c2416_init_irq(void);
extern struct syscore_ops s3c2416_irq_syscore_ops; extern struct syscore_ops s3c2416_irq_syscore_ops;
#else #else