All of lore.kernel.org
 help / color / mirror / Atom feed
From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 13/16] ARM: zynq: convert to CONFIG_MULTI_IRQ_HANDLER
Date: Mon, 26 Sep 2011 12:02:32 +0100	[thread overview]
Message-ID: <1317034955-1029-14-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1317034955-1029-1-git-send-email-marc.zyngier@arm.com>

Convert the zynq platform to be using the gic_handle_irq
function as its primary interrupt handler.

Acked-by: John Linn <john.linn@xilinx.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 arch/arm/Kconfig                              |    1 +
 arch/arm/mach-zynq/common.c                   |    1 +
 arch/arm/mach-zynq/include/mach/entry-macro.S |    3 ---
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 70a947e..0514264 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -911,6 +911,7 @@ config ARCH_ZYNQ
 	select ARM_AMBA
 	select ICST
 	select USE_OF
+	select MULTI_IRQ_HANDLER
 	help
 	  Support for Xilinx Zynq ARM Cortex A9 Platform
 endchoice
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 73e9368..ab5cfdd 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -112,6 +112,7 @@ static const char *xilinx_dt_match[] = {
 MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform")
 	.map_io		= xilinx_map_io,
 	.init_irq	= xilinx_irq_init,
+	.handle_irq	= gic_handle_irq,
 	.init_machine	= xilinx_init_machine,
 	.timer		= &xttcpss_sys_timer,
 	.dt_compat	= xilinx_dt_match,
diff --git a/arch/arm/mach-zynq/include/mach/entry-macro.S b/arch/arm/mach-zynq/include/mach/entry-macro.S
index 3cfc01b..d621fb7 100644
--- a/arch/arm/mach-zynq/include/mach/entry-macro.S
+++ b/arch/arm/mach-zynq/include/mach/entry-macro.S
@@ -20,9 +20,6 @@
  * GNU General Public License for more details.
  */
 
-#include <mach/hardware.h>
-#include <asm/hardware/entry-macro-gic.S>
-
 		.macro  disable_fiq
 		.endm
 
-- 
1.7.0.4

  parent reply	other threads:[~2011-09-26 11:02 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-26 11:02 [PATCH v2 00/16] Switch GIC users (and omap2plus) to CONFIG_MULTI_IRQ_HANDLER Marc Zyngier
2011-09-26 11:02 ` [PATCH v2 01/16] ARM: Make global handler and CONFIG_MULTI_IRQ_HANDLER mutually exclusive Marc Zyngier
2011-09-28  1:00   ` Tony Lindgren
2011-09-26 11:02 ` [PATCH v2 02/16] ARM: smp: Add an IPI handler callable from C code Marc Zyngier
2011-09-28  1:01   ` Tony Lindgren
2011-09-26 11:02 ` [PATCH v2 03/16] ARM: GIC: Add global gic_handle_irq() function Marc Zyngier
2011-09-28  1:01   ` Tony Lindgren
2011-09-26 11:02 ` [PATCH v2 04/16] ARM: RealView: convert to CONFIG_MULTI_IRQ_HANDLER Marc Zyngier
2011-09-26 11:02 ` [PATCH v2 05/16] ARM: VExpress: " Marc Zyngier
2011-09-26 11:02 ` [PATCH v2 06/16] ARM: msm: convert SMP platforms " Marc Zyngier
2011-09-26 11:02 ` [PATCH v2 07/16] ARM: GIC: Add global gic_handle_irq_offset() function Marc Zyngier
2011-09-28 15:50   ` Rob Herring
2011-09-29  8:53     ` Marc Zyngier
2011-09-26 11:02 ` [PATCH v2 08/16] ARM: exynos4: convert to CONFIG_MULTI_IRQ_HANDLER Marc Zyngier
2011-09-26 11:02 ` [PATCH v2 09/16] ARM: tegra2: " Marc Zyngier
2011-09-26 11:02 ` [PATCH v2 10/16] ARM: ux500: " Marc Zyngier
2011-09-27 11:47   ` Linus Walleij
2011-09-27 12:33     ` Marc Zyngier
2011-09-26 11:02 ` [PATCH v2 11/16] ARM: shmobile: convert smp platforms to gic_handle_irq() Marc Zyngier
2011-09-26 11:02 ` [PATCH v2 12/16] ARM: cns3xxx: convert to CONFIG_MULTI_IRQ_HANDLER Marc Zyngier
2011-09-26 11:02 ` Marc Zyngier [this message]
2011-09-26 11:02 ` [PATCH v2 14/16] ARM: omap2/3: Add global omap2/3_intc_handle_irq() functions Marc Zyngier
2011-09-28  1:02   ` Tony Lindgren
2011-09-26 11:02 ` [PATCH v2 15/16] ARM: omap2plus: convert to CONFIG_MULTI_IRQ_HANDLER Marc Zyngier
2011-09-28  1:04   ` Tony Lindgren
2011-09-26 11:02 ` [PATCH v2 16/16] ARM: GIC: Make MULTI_IRQ_HANDLER mandatory Marc Zyngier
2011-09-27  3:43   ` Shawn Guo
2011-09-27  8:32     ` Marc Zyngier
2011-09-27 10:19       ` Shawn Guo
2011-09-28  1:04   ` Tony Lindgren
2011-09-26 20:20 ` [PATCH v2 00/16] Switch GIC users (and omap2plus) to CONFIG_MULTI_IRQ_HANDLER David Brown
2011-09-27  0:15   ` David Brown
2011-09-27  8:58     ` Marc Zyngier
2011-09-27 10:20 ` Shawn Guo
2011-09-27 10:22   ` Marc Zyngier
2011-09-27 23:53 ` Tony Lindgren
2011-09-28  0:53   ` Tony Lindgren

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=1317034955-1029-14-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 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.