From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH 10/14] ARM: cns3xxx: convert to CONFIG_MULTI_IRQ_HANDLER
Date: Fri, 23 Sep 2011 17:51:28 +0100 [thread overview]
Message-ID: <1316796692-15964-11-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1316796692-15964-1-git-send-email-marc.zyngier@arm.com>
Convert the cns3xxx platform to be using the gic_handle_irq
function as its primary interrupt handler.
Cc: Anton Vorontsov <avorontsov@mvista.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
arch/arm/Kconfig | 1 +
arch/arm/mach-cns3xxx/cns3420vb.c | 2 ++
arch/arm/mach-cns3xxx/include/mach/entry-macro.S | 2 --
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e32a4d3..70a947e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -334,6 +334,7 @@ config ARCH_CNS3XXX
select ARM_GIC
select MIGHT_HAVE_PCI
select PCI_DOMAINS if PCI
+ select MULTI_IRQ_HANDLER
help
Support for Cavium Networks CNS3XXX platform.
diff --git a/arch/arm/mach-cns3xxx/cns3420vb.c b/arch/arm/mach-cns3xxx/cns3420vb.c
index 55f7b4b..594852f 100644
--- a/arch/arm/mach-cns3xxx/cns3420vb.c
+++ b/arch/arm/mach-cns3xxx/cns3420vb.c
@@ -26,6 +26,7 @@
#include <linux/mtd/partitions.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
+#include <asm/hardware/gic.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/time.h>
@@ -201,5 +202,6 @@ MACHINE_START(CNS3420VB, "Cavium Networks CNS3420 Validation Board")
.map_io = cns3420_map_io,
.init_irq = cns3xxx_init_irq,
.timer = &cns3xxx_timer,
+ .handle_irq = gic_handle_irq,
.init_machine = cns3420_init,
MACHINE_END
diff --git a/arch/arm/mach-cns3xxx/include/mach/entry-macro.S b/arch/arm/mach-cns3xxx/include/mach/entry-macro.S
index d87bfc3..01c57df 100644
--- a/arch/arm/mach-cns3xxx/include/mach/entry-macro.S
+++ b/arch/arm/mach-cns3xxx/include/mach/entry-macro.S
@@ -8,8 +8,6 @@
* published by the Free Software Foundation.
*/
-#include <asm/hardware/entry-macro-gic.S>
-
.macro disable_fiq
.endm
--
1.7.0.4
next prev parent reply other threads:[~2011-09-23 16:51 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-23 16:51 [RFC PATCH 00/14] Switch GIC users (and omap2plus) to CONFIG_MULTI_IRQ_HANDLER Marc Zyngier
2011-09-23 16:51 ` [RFC PATCH 01/14] ARM: GIC: Add global gic_handle_irq() function Marc Zyngier
2011-09-23 20:18 ` Russell King - ARM Linux
2011-09-26 10:40 ` Marc Zyngier
2011-09-23 16:51 ` [RFC PATCH 02/14] ARM: RealView: convert to CONFIG_MULTI_IRQ_HANDLER Marc Zyngier
2011-09-23 16:51 ` [RFC PATCH 03/14] ARM: VExpress: " Marc Zyngier
2011-09-23 16:51 ` [RFC PATCH 04/14] ARM: msm: convert SMP platforms " Marc Zyngier
2011-09-23 16:51 ` [RFC PATCH 05/14] ARM: GIC: Add global gic_handle_irq_offset() function Marc Zyngier
2011-09-23 16:51 ` [RFC PATCH 06/14] ARM: exynos4: convert to CONFIG_MULTI_IRQ_HANDLER Marc Zyngier
2011-09-23 16:51 ` [RFC PATCH 07/14] ARM: tegra2: " Marc Zyngier
2011-09-23 17:28 ` Stephen Warren
2011-09-23 16:51 ` [RFC PATCH 08/14] ARM: ux500: " Marc Zyngier
2011-09-23 16:51 ` [RFC PATCH 09/14] ARM: shmobile: convert smp platforms to gic_handle_irq() Marc Zyngier
2011-09-23 16:51 ` Marc Zyngier [this message]
2011-09-26 13:15 ` [RFC PATCH 10/14] ARM: cns3xxx: convert to CONFIG_MULTI_IRQ_HANDLER Anton Vorontsov
2011-09-23 16:51 ` [RFC PATCH 11/14] ARM: zynq: " Marc Zyngier
2011-09-23 20:53 ` John Linn
2011-09-23 16:51 ` [RFC PATCH 12/14] ARM: omap2/3: Add global omap2/3_intc_handle_irq() functions Marc Zyngier
2011-09-23 16:51 ` [RFC PATCH 13/14] ARM: omap2plus: convert to CONFIG_MULTI_IRQ_HANDLER Marc Zyngier
2011-09-23 16:51 ` [RFC PATCH 14/14] ARM: GIC: Make MULTI_IRQ_HANDLER mandatory Marc Zyngier
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=1316796692-15964-11-git-send-email-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=linux-arm-kernel@lists.infradead.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).