Merge branch 'exynos/pwm-clocksource' into late/multiplatform

[~andy/linux] / arch / arm / mach-vt8500 / vt8500.c

diff --git a/arch/arm/mach-vt8500/vt8500.c b/arch/arm/mach-vt8500/vt8500.c
index 49e80053d828c51e6d3ffd4d819b08d62af3cf17..1dd281efc02035dac37cc971a0db4c69c98c8a11 100644 (file)
--- a/arch/arm/mach-vt8500/vt8500.c
+++ b/arch/arm/mach-vt8500/vt8500.c
@@ -20,6 +20,7 @@
 
 #include <linux/clocksource.h>
 #include <linux/io.h>
+#include <linux/irqchip.h>
 #include <linux/pm.h>
 
 #include <asm/mach-types.h>
@@ -166,16 +167,6 @@ void __init vt8500_init(void)
        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
-static const struct of_device_id vt8500_irq_match[] __initconst = {
-       { .compatible = "via,vt8500-intc", .data = vt8500_irq_init, },
-       { /* sentinel */ },
-};
-
-static void __init vt8500_init_irq(void)
-{
-       of_irq_init(vt8500_irq_match);
-};
-
 static const char * const vt8500_dt_compat[] = {
        "via,vt8500",
        "wm,wm8650",
@@ -187,10 +178,9 @@ static const char * const vt8500_dt_compat[] = {
 DT_MACHINE_START(WMT_DT, "VIA/Wondermedia SoC (Device Tree Support)")
        .dt_compat      = vt8500_dt_compat,
        .map_io         = vt8500_map_io,
-       .init_irq       = vt8500_init_irq,
+       .init_irq       = irqchip_init,
        .init_machine   = vt8500_init,
        .init_time      = clocksource_of_init,
        .restart        = vt8500_restart,
-       .handle_irq     = vt8500_handle_irq,
 MACHINE_END