From: Olof Johansson Date: Wed, 6 Feb 2013 00:31:33 +0000 (-0800) Subject: Merge branch 'next/irq-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: firefly_0821_release~3680^2~1075^2~7 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=5060c8881a4b177e27d5bcf351212f2bee125955;p=firefly-linux-kernel-4.4.55.git Merge branch 'next/irq-s3c24xx' of git://git./linux/kernel/git/kgene/linux-samsung into next/cleanup From Kukjin Kim: This is redoing the s3c24xx irqs in a generic way by using a declarative approach. * 'next/irq-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: S3C24XX: transform s3c2443 subirqs into new structure ARM: S3C24XX: modify s3c2443 irq init to initialize all irqs ARM: S3C24XX: move s3c2443 irq code to irq.c ARM: S3C24XX: transform s3c2416 irqs into new structure ARM: S3C24XX: modify s3c2416 irq init to initialize all irqs ARM: S3C24XX: move s3c2416 irq init to common irq code ARM: S3C24XX: Modify s3c_irq_wake to use the hwirq property ARM: S3C24XX: Move irq syscore-ops to irq-pm ARM: S3C24XX: transform irq handling into a declarative form Signed-off-by: Olof Johansson --- 5060c8881a4b177e27d5bcf351212f2bee125955 diff --cc arch/arm/mach-s3c24xx/mach-smdk2416.c index 72dfec689322,2abb66fdf928..ebb2e61f3d07 --- a/arch/arm/mach-s3c24xx/mach-smdk2416.c +++ b/arch/arm/mach-s3c24xx/mach-smdk2416.c @@@ -250,9 -250,9 +250,9 @@@ MACHINE_START(SMDK2416, "SMDK2416" /* Maintainer: Yauhen Kharuzhy */ .atag_offset = 0x100, - .init_irq = s3c24xx_init_irq, + .init_irq = s3c2416_init_irq, .map_io = smdk2416_map_io, .init_machine = smdk2416_machine_init, - .timer = &s3c24xx_timer, + .init_time = s3c24xx_timer_init, .restart = s3c2416_restart, MACHINE_END diff --cc arch/arm/mach-s3c24xx/mach-smdk2443.c index 406c8137620e,8b65a54bae61..fc65d74d3c73 --- a/arch/arm/mach-s3c24xx/mach-smdk2443.c +++ b/arch/arm/mach-s3c24xx/mach-smdk2443.c @@@ -140,9 -140,9 +140,9 @@@ MACHINE_START(SMDK2443, "SMDK2443" /* Maintainer: Ben Dooks */ .atag_offset = 0x100, - .init_irq = s3c24xx_init_irq, + .init_irq = s3c2443_init_irq, .map_io = smdk2443_map_io, .init_machine = smdk2443_machine_init, - .timer = &s3c24xx_timer, + .init_time = s3c24xx_timer_init, .restart = s3c2443_restart, MACHINE_END