diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2013-01-02 09:38:53 -0600 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2013-01-12 10:52:16 -0600 |
| commit | cdbac5bb619a91c896c5aaba531575b9df644d38 (patch) | |
| tree | 1257307df0c876f7c06e8971b4ff626116a3a63c | |
| parent | e9c515589df7731591d15e506ba6d69713faae41 (diff) | |
| download | linux-stable-cdbac5bb619a91c896c5aaba531575b9df644d38.tar.gz linux-stable-cdbac5bb619a91c896c5aaba531575b9df644d38.tar.bz2 linux-stable-cdbac5bb619a91c896c5aaba531575b9df644d38.zip | |
ARM: picoxcell: use common irqchip_init function
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Jamie Iles <jamie@jamieiles.com>
| -rw-r--r-- | arch/arm/mach-picoxcell/common.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c index b17401ac5f5b..35ee21443f03 100644 --- a/arch/arm/mach-picoxcell/common.c +++ b/arch/arm/mach-picoxcell/common.c @@ -9,6 +9,7 @@ */ #include <linux/delay.h> #include <linux/irq.h> +#include <linux/irqchip.h> #include <linux/irqdomain.h> #include <linux/of.h> #include <linux/of_address.h> @@ -17,7 +18,6 @@ #include <linux/dw_apb_timer.h> #include <asm/mach/arch.h> -#include <asm/hardware/vic.h> #include <asm/mach/map.h> #include "common.h" @@ -70,16 +70,6 @@ static const char *picoxcell_dt_match[] = { NULL }; -static const struct of_device_id vic_of_match[] __initconst = { - { .compatible = "arm,pl192-vic", .data = vic_of_init, }, - { /* Sentinel */ } -}; - -static void __init picoxcell_init_irq(void) -{ - of_irq_init(vic_of_match); -} - static void picoxcell_wdt_restart(char mode, const char *cmd) { /* @@ -97,7 +87,7 @@ static void picoxcell_wdt_restart(char mode, const char *cmd) DT_MACHINE_START(PICOXCELL, "Picochip picoXcell") .map_io = picoxcell_map_io, .nr_irqs = NR_IRQS_LEGACY, - .init_irq = picoxcell_init_irq, + .init_irq = irqchip_init, .timer = &dw_apb_timer, .init_machine = picoxcell_init_machine, .dt_compat = picoxcell_dt_match, |