mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
ARM: integrator: convert to use irqchip_init
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> Acked-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
59318461c8
commit
44fa72d129
2 changed files with 4 additions and 16 deletions
|
@ -31,7 +31,7 @@
|
||||||
#include <linux/clockchips.h>
|
#include <linux/clockchips.h>
|
||||||
#include <linux/interrupt.h>
|
#include <linux/interrupt.h>
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
#include <linux/irqchip/versatile-fpga.h>
|
#include <linux/irqchip.h>
|
||||||
#include <linux/mtd/physmap.h>
|
#include <linux/mtd/physmap.h>
|
||||||
#include <linux/clk.h>
|
#include <linux/clk.h>
|
||||||
#include <linux/platform_data/clk-integrator.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);
|
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)
|
static void __init ap_init_irq_of(void)
|
||||||
{
|
{
|
||||||
cm_init();
|
cm_init();
|
||||||
of_irq_init(fpga_irq_of_match);
|
irqchip_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* For the Device Tree, add in the UART callbacks as AUXDATA */
|
/* 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,
|
.map_io = ap_map_io,
|
||||||
.init_early = ap_init_early,
|
.init_early = ap_init_early,
|
||||||
.init_irq = ap_init_irq_of,
|
.init_irq = ap_init_irq_of,
|
||||||
.handle_irq = fpga_handle_irq,
|
|
||||||
.init_time = ap_of_timer_init,
|
.init_time = ap_of_timer_init,
|
||||||
.init_machine = ap_init_of,
|
.init_machine = ap_init_of,
|
||||||
.restart = integrator_restart,
|
.restart = integrator_restart,
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
#include <linux/amba/clcd.h>
|
#include <linux/amba/clcd.h>
|
||||||
#include <linux/amba/mmci.h>
|
#include <linux/amba/mmci.h>
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
#include <linux/irqchip/versatile-fpga.h>
|
#include <linux/irqchip.h>
|
||||||
#include <linux/gfp.h>
|
#include <linux/gfp.h>
|
||||||
#include <linux/mtd/physmap.h>
|
#include <linux/mtd/physmap.h>
|
||||||
#include <linux/of_irq.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);
|
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)
|
static void __init intcp_init_irq_of(void)
|
||||||
{
|
{
|
||||||
cm_init();
|
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,
|
.map_io = intcp_map_io,
|
||||||
.init_early = intcp_init_early,
|
.init_early = intcp_init_early,
|
||||||
.init_irq = intcp_init_irq_of,
|
.init_irq = intcp_init_irq_of,
|
||||||
.handle_irq = fpga_handle_irq,
|
|
||||||
.init_machine = intcp_init_of,
|
.init_machine = intcp_init_of,
|
||||||
.restart = integrator_restart,
|
.restart = integrator_restart,
|
||||||
.dt_compat = intcp_dt_board_compat,
|
.dt_compat = intcp_dt_board_compat,
|
||||||
|
|
Loading…
Reference in a new issue