From: robherring2@gmail.com (Rob Herring)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 04/11] ARM: integrator: convert to use irqchip_init
Date: Thu, 29 May 2014 17:40:14 -0500 [thread overview]
Message-ID: <1401403221-27523-5-git-send-email-robherring2@gmail.com> (raw)
In-Reply-To: <1401403221-27523-1-git-send-email-robherring2@gmail.com>
From: Rob Herring <robh@kernel.org>
Now that versatile-fpga irqchip has IRQCHIP_DECLARE support, the interrupt
related initialization can be removed.
Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Linus Walleij <linus.walleij@linaro.org>
---
v2:
- New patch
arch/arm/mach-integrator/integrator_ap.c | 10 ++--------
arch/arm/mach-integrator/integrator_cp.c | 10 ++--------
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index dd0cc67..645da16 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -31,7 +31,7 @@
#include <linux/clockchips.h>
#include <linux/interrupt.h>
#include <linux/io.h>
-#include <linux/irqchip/versatile-fpga.h>
+#include <linux/irqchip.h>
#include <linux/mtd/physmap.h>
#include <linux/clk.h>
#include <linux/platform_data/clk-integrator.h>
@@ -439,15 +439,10 @@ static void __init ap_of_timer_init(void)
integrator_clockevent_init(rate, base, irq);
}
-static const struct of_device_id fpga_irq_of_match[] __initconst = {
- { .compatible = "arm,versatile-fpga-irq", .data = fpga_irq_of_init, },
- { /* Sentinel */ }
-};
-
static void __init ap_init_irq_of(void)
{
cm_init();
- of_irq_init(fpga_irq_of_match);
+ irqchip_init();
}
/* For the Device Tree, add in the UART callbacks as AUXDATA */
@@ -570,7 +565,6 @@ DT_MACHINE_START(INTEGRATOR_AP_DT, "ARM Integrator/AP (Device Tree)")
.map_io = ap_map_io,
.init_early = ap_init_early,
.init_irq = ap_init_irq_of,
- .handle_irq = fpga_handle_irq,
.init_time = ap_of_timer_init,
.init_machine = ap_init_of,
.restart = integrator_restart,
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index a938242..7ade590 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -20,7 +20,7 @@
#include <linux/amba/clcd.h>
#include <linux/amba/mmci.h>
#include <linux/io.h>
-#include <linux/irqchip/versatile-fpga.h>
+#include <linux/irqchip.h>
#include <linux/gfp.h>
#include <linux/mtd/physmap.h>
#include <linux/of_irq.h>
@@ -235,15 +235,10 @@ static void __init intcp_init_early(void)
sched_clock_register(intcp_read_sched_clock, 32, 24000000);
}
-static const struct of_device_id fpga_irq_of_match[] __initconst = {
- { .compatible = "arm,versatile-fpga-irq", .data = fpga_irq_of_init, },
- { /* Sentinel */ }
-};
-
static void __init intcp_init_irq_of(void)
{
cm_init();
- of_irq_init(fpga_irq_of_match);
+ irqchip_init();
}
/*
@@ -340,7 +335,6 @@ DT_MACHINE_START(INTEGRATOR_CP_DT, "ARM Integrator/CP (Device Tree)")
.map_io = intcp_map_io,
.init_early = intcp_init_early,
.init_irq = intcp_init_irq_of,
- .handle_irq = fpga_handle_irq,
.init_machine = intcp_init_of,
.restart = integrator_restart,
.dt_compat = intcp_dt_board_compat,
--
1.9.1
next prev parent reply other threads:[~2014-05-29 22:40 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-29 22:40 [PATCH v2 00/11] ARM: Versatile irq and clock DT support Rob Herring
2014-05-29 22:40 ` [PATCH v2 01/11] dts: versatile: add missing irq controller properties Rob Herring
2014-05-29 22:40 ` [PATCH v2 02/11] irqchip: versatile-fpga: Add IRQCHIP_DECLARE support Rob Herring
2014-05-30 9:43 ` Linus Walleij
2014-05-29 22:40 ` [PATCH v2 03/11] irqchip: versatile-fpga: add support for arm, versatile-sic Rob Herring
2014-05-30 9:46 ` Linus Walleij
2014-05-29 22:40 ` Rob Herring [this message]
2014-05-30 9:47 ` [PATCH v2 04/11] ARM: integrator: convert to use irqchip_init Linus Walleij
2014-05-29 22:40 ` [PATCH v2 05/11] ARM: versatile: remove init_irq hook for DT boot Rob Herring
2014-05-30 9:48 ` Linus Walleij
2014-05-29 22:40 ` [PATCH v2 06/11] dts: versatile: add pl180 compatible strings Rob Herring
2014-05-29 22:40 ` [PATCH v2 07/11] dt/bindings: arm-boards: add binding for Versatile core module Rob Herring
2014-05-30 9:49 ` Linus Walleij
2014-05-29 22:40 ` [PATCH v2 08/11] dt/bindings: add compatible string for versatile osc clock Rob Herring
2014-05-29 22:40 ` [PATCH v2 09/11] ARM: timer-sp: allow getting timer1 clock from DT to fallback to legacy clock Rob Herring
2014-05-29 22:40 ` [PATCH v2 10/11] dts: versatile: add clock tree Rob Herring
2014-05-30 9:52 ` Linus Walleij
2014-05-29 22:40 ` [PATCH v2 11/11] clk: versatile: add versatile OSC support Rob Herring
2014-05-30 9:55 ` Linus Walleij
2014-05-30 23:03 ` Mike Turquette
2014-05-31 2:38 ` Rob Herring
2014-06-02 21:08 ` Mike Turquette
2014-05-30 9:41 ` [PATCH v2 00/11] ARM: Versatile irq and clock DT support Linus Walleij
2014-05-30 12:17 ` Rob Herring
2014-06-21 2:10 ` Jason Cooper
2014-06-23 11:08 ` Linus Walleij
2014-06-26 12:52 ` Linus Walleij
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=1401403221-27523-5-git-send-email-robherring2@gmail.com \
--to=robherring2@gmail.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).