diff options
author | Rob Herring <rob.herring@calxeda.com> | 2012-11-05 17:18:28 -0500 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2013-01-12 11:47:32 -0500 |
commit | 0529e315bbda5d502c93df2cfafba9bb337fbdf4 (patch) | |
tree | 461bf1c88c60e294e598eaa52d9b0b46b4ffd3ba /arch/arm/mach-bcm | |
parent | 81243e444c6e9d1625073e4a3d3bc244c8a545f0 (diff) |
ARM: use common irqchip_init for GIC init
Convert all GIC DT initialization over to use common irqchip_init
function.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: David Brown <davidb@codeaurora.org>
Cc: Daniel Walker <dwalker@fifo99.com>
Cc: Bryan Huntsman <bryanh@codeaurora.org>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Magnus Damm <magnus.damm@gmail.com>
Cc: Dinh Nguyen <dinguyen@altera.com>
Cc: Viresh Kumar <viresh.linux@gmail.com>
Cc: Shiraz Hashim <shiraz.hashim@st.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-bcm')
-rw-r--r-- | arch/arm/mach-bcm/board_bcm.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/arch/arm/mach-bcm/board_bcm.c b/arch/arm/mach-bcm/board_bcm.c index 6ad83d7f9517..5c920bde6791 100644 --- a/arch/arm/mach-bcm/board_bcm.c +++ b/arch/arm/mach-bcm/board_bcm.c | |||
@@ -11,22 +11,15 @@ | |||
11 | * GNU General Public License for more details. | 11 | * GNU General Public License for more details. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <linux/of_irq.h> | ||
15 | #include <linux/of_platform.h> | 14 | #include <linux/of_platform.h> |
16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
17 | #include <linux/device.h> | 16 | #include <linux/device.h> |
18 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
18 | #include <linux/irqchip.h> | ||
19 | 19 | ||
20 | #include <asm/mach/arch.h> | 20 | #include <asm/mach/arch.h> |
21 | #include <asm/hardware/gic.h> | ||
22 | |||
23 | #include <asm/mach/time.h> | 21 | #include <asm/mach/time.h> |
24 | 22 | ||
25 | static const struct of_device_id irq_match[] = { | ||
26 | {.compatible = "arm,cortex-a9-gic", .data = gic_of_init, }, | ||
27 | {} | ||
28 | }; | ||
29 | |||
30 | static void timer_init(void) | 23 | static void timer_init(void) |
31 | { | 24 | { |
32 | } | 25 | } |
@@ -35,11 +28,6 @@ static struct sys_timer timer = { | |||
35 | .init = timer_init, | 28 | .init = timer_init, |
36 | }; | 29 | }; |
37 | 30 | ||
38 | static void __init init_irq(void) | ||
39 | { | ||
40 | of_irq_init(irq_match); | ||
41 | } | ||
42 | |||
43 | static void __init board_init(void) | 31 | static void __init board_init(void) |
44 | { | 32 | { |
45 | of_platform_populate(NULL, of_default_bus_match_table, NULL, | 33 | of_platform_populate(NULL, of_default_bus_match_table, NULL, |
@@ -49,7 +37,7 @@ static void __init board_init(void) | |||
49 | static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351", NULL, }; | 37 | static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351", NULL, }; |
50 | 38 | ||
51 | DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor") | 39 | DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor") |
52 | .init_irq = init_irq, | 40 | .init_irq = irqchip_init, |
53 | .timer = &timer, | 41 | .timer = &timer, |
54 | .init_machine = board_init, | 42 | .init_machine = board_init, |
55 | .dt_compat = bcm11351_dt_compat, | 43 | .dt_compat = bcm11351_dt_compat, |