summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-bcm
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-11-05 23:18:28 +0100
committerRob Herring <rob.herring@calxeda.com>2013-01-12 17:47:32 +0100
commit0529e315bbda5d502c93df2cfafba9bb337fbdf4 (patch)
tree461bf1c88c60e294e598eaa52d9b0b46b4ffd3ba /arch/arm/mach-bcm
parentirqchip: Move ARM GIC to drivers/irqchip (diff)
downloadlinux-0529e315bbda5d502c93df2cfafba9bb337fbdf4.tar.xz
linux-0529e315bbda5d502c93df2cfafba9bb337fbdf4.zip
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.c16
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 @@
* GNU General Public License for more details.
*/
-#include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <linux/init.h>
#include <linux/device.h>
#include <linux/platform_device.h>
+#include <linux/irqchip.h>
#include <asm/mach/arch.h>
-#include <asm/hardware/gic.h>
-
#include <asm/mach/time.h>
-static const struct of_device_id irq_match[] = {
- {.compatible = "arm,cortex-a9-gic", .data = gic_of_init, },
- {}
-};
-
static void timer_init(void)
{
}
@@ -35,11 +28,6 @@ static struct sys_timer timer = {
.init = timer_init,
};
-static void __init init_irq(void)
-{
- of_irq_init(irq_match);
-}
-
static void __init board_init(void)
{
of_platform_populate(NULL, of_default_bus_match_table, NULL,
@@ -49,7 +37,7 @@ static void __init board_init(void)
static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351", NULL, };
DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor")
- .init_irq = init_irq,
+ .init_irq = irqchip_init,
.timer = &timer,
.init_machine = board_init,
.dt_compat = bcm11351_dt_compat,