From: "Heiko Stübner" <heiko@sntech.de> To: Kukjin Kim <kgene.kim@samsung.com> Cc: Ben Dooks <ben-linux@fluff.org>, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 09/10] ARM: S3C24XX: modify s3c2443 irq init to initialize all irqs Date: Sun, 18 Nov 2012 01:57:03 +0100 [thread overview] Message-ID: <201211180157.03496.heiko@sntech.de> (raw) In-Reply-To: <201211180151.01029.heiko@sntech.de> 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@sntech.de> --- 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(-) diff --git a/arch/arm/mach-s3c24xx/mach-smdk2443.c b/arch/arm/mach-s3c24xx/mach-smdk2443.c index 2568656..ddabfdf 100644 --- a/arch/arm/mach-s3c24xx/mach-smdk2443.c +++ b/arch/arm/mach-s3c24xx/mach-smdk2443.c @@ -141,7 +141,7 @@ MACHINE_START(SMDK2443, "SMDK2443") /* Maintainer: Ben Dooks <ben-linux@fluff.org> */ .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, diff --git a/arch/arm/plat-s3c24xx/irq.c b/arch/arm/plat-s3c24xx/irq.c index d7baeaf..9e559ed 100644 --- a/arch/arm/plat-s3c24xx/irq.c +++ b/arch/arm/plat-s3c24xx/irq.c @@ -1116,10 +1116,11 @@ static int s3c2443_add_sub(unsigned int base, return 0; } -static int s3c2443_irq_add(struct device *dev, - struct subsys_interface *sif) +void __init s3c2443_init_irq(void) { - printk("S3C2443: IRQ Support\n"); + 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); @@ -1137,20 +1138,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); - - return 0; -} - -static struct subsys_interface s3c2443_irq_interface = { - .name = "s3c2443_irq", - .subsys = &s3c2443_subsys, - .add_dev = s3c2443_irq_add, -}; - -static int __init s3c2443_irq_init(void) -{ - return subsys_interface_register(&s3c2443_irq_interface); } - -arch_initcall(s3c2443_irq_init); #endif diff --git a/arch/arm/plat-samsung/include/plat/s3c2443.h b/arch/arm/plat-samsung/include/plat/s3c2443.h index a5b794f..71b88ec 100644 --- a/arch/arm/plat-samsung/include/plat/s3c2443.h +++ b/arch/arm/plat-samsung/include/plat/s3c2443.h @@ -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 -- 1.7.2.3
WARNING: multiple messages have this Message-ID (diff)
From: heiko@sntech.de (Heiko Stübner) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 09/10] ARM: S3C24XX: modify s3c2443 irq init to initialize all irqs Date: Sun, 18 Nov 2012 01:57:03 +0100 [thread overview] Message-ID: <201211180157.03496.heiko@sntech.de> (raw) In-Reply-To: <201211180151.01029.heiko@sntech.de> 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@sntech.de> --- 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(-) diff --git a/arch/arm/mach-s3c24xx/mach-smdk2443.c b/arch/arm/mach-s3c24xx/mach-smdk2443.c index 2568656..ddabfdf 100644 --- a/arch/arm/mach-s3c24xx/mach-smdk2443.c +++ b/arch/arm/mach-s3c24xx/mach-smdk2443.c @@ -141,7 +141,7 @@ MACHINE_START(SMDK2443, "SMDK2443") /* Maintainer: Ben Dooks <ben-linux@fluff.org> */ .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, diff --git a/arch/arm/plat-s3c24xx/irq.c b/arch/arm/plat-s3c24xx/irq.c index d7baeaf..9e559ed 100644 --- a/arch/arm/plat-s3c24xx/irq.c +++ b/arch/arm/plat-s3c24xx/irq.c @@ -1116,10 +1116,11 @@ static int s3c2443_add_sub(unsigned int base, return 0; } -static int s3c2443_irq_add(struct device *dev, - struct subsys_interface *sif) +void __init s3c2443_init_irq(void) { - printk("S3C2443: IRQ Support\n"); + 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); @@ -1137,20 +1138,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); - - return 0; -} - -static struct subsys_interface s3c2443_irq_interface = { - .name = "s3c2443_irq", - .subsys = &s3c2443_subsys, - .add_dev = s3c2443_irq_add, -}; - -static int __init s3c2443_irq_init(void) -{ - return subsys_interface_register(&s3c2443_irq_interface); } - -arch_initcall(s3c2443_irq_init); #endif diff --git a/arch/arm/plat-samsung/include/plat/s3c2443.h b/arch/arm/plat-samsung/include/plat/s3c2443.h index a5b794f..71b88ec 100644 --- a/arch/arm/plat-samsung/include/plat/s3c2443.h +++ b/arch/arm/plat-samsung/include/plat/s3c2443.h @@ -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 -- 1.7.2.3
next prev parent reply other threads:[~2012-11-18 0:57 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-11-18 0:51 [PATCH 00/10] ARM: S3C24XX: rework irq handling for a later dt usage Heiko Stübner 2012-11-18 0:51 ` Heiko Stübner 2012-11-18 0:52 ` [PATCH 01/10] ARM: S3C24XX: transform irq handling into a declarative form Heiko Stübner 2012-11-18 0:52 ` Heiko Stübner 2012-11-18 0:52 ` [PATCH 02/10] ARM: S3C24XX: move irq-pm code into main irq file Heiko Stübner 2012-11-18 0:52 ` Heiko Stübner 2012-11-18 0:53 ` [PATCH 03/10] ARM: S3C24XX: cleanup irq-pm integration Heiko Stübner 2012-11-18 0:53 ` Heiko Stübner 2012-11-18 0:54 ` [PATCH 04/10] ARM: S3C24XX: move s3c2416 irq init to common irq code Heiko Stübner 2012-11-18 0:54 ` Heiko Stübner 2012-11-18 0:54 ` [PATCH 05/10] ARM: S3C24XX: modify s3c2416 irq init to initialize all irqs Heiko Stübner 2012-11-18 0:54 ` Heiko Stübner 2012-11-18 0:55 ` [PATCH 06/10] ARM: S3C24XX: assimilate s3c2416 subirqs into new structure Heiko Stübner 2012-11-18 0:55 ` Heiko Stübner 2012-11-18 0:55 ` [PATCH 07/10] ARM: S3C24XX: assimilate second s3c2416 interrupt " Heiko Stübner 2012-11-18 0:55 ` Heiko Stübner 2012-11-18 0:56 ` [PATCH 08/10] ARM: S3C24XX: move s3c2443 irq code to irq.c Heiko Stübner 2012-11-18 0:56 ` Heiko Stübner 2012-11-18 0:57 ` Heiko Stübner [this message] 2012-11-18 0:57 ` [PATCH 09/10] ARM: S3C24XX: modify s3c2443 irq init to initialize all irqs Heiko Stübner 2012-11-18 0:57 ` [PATCH 10/10] ARM: S3C24XX: assimilate s3c2443 subirqs into new structure Heiko Stübner 2012-11-18 0:57 ` Heiko Stübner 2012-11-20 11:51 ` [PATCH 00/10] ARM: S3C24XX: rework irq handling for a later dt usage Kukjin Kim 2012-11-20 11:51 ` Kukjin Kim
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=201211180157.03496.heiko@sntech.de \ --to=heiko@sntech.de \ --cc=ben-linux@fluff.org \ --cc=kgene.kim@samsung.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-samsung-soc@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.