1 files changed, 18 insertions, 6 deletions

diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c
index 34d08347be5f..febee47bc116 100644
--- a/arch/arm/mach-picoxcell/common.c
+++ b/arch/arm/mach-picoxcell/common.c
@@ -11,16 +11,30 @@
 #include <linux/irqdomain.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 
 #include <asm/mach/arch.h>
 #include <asm/hardware/vic.h>
+#include <asm/mach/map.h>
 
 #include <mach/map.h>
 #include <mach/picoxcell_soc.h>
 
 #include "common.h"
 
+static struct map_desc io_map __initdata = {
+        .virtual        = PHYS_TO_IO(PICOXCELL_PERIPH_BASE),
+        .pfn            = __phys_to_pfn(PICOXCELL_PERIPH_BASE),
+        .length         = PICOXCELL_PERIPH_LENGTH,
+        .type           = MT_DEVICE,
+};
+
+static void __init picoxcell_map_io(void)
+{
+        iotable_init(&io_map, 1);
+}
+
 static void __init picoxcell_init_machine(void)
 {
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
@@ -33,22 +47,20 @@ static const char *picoxcell_dt_match[] = {
 };
 
 static const struct of_device_id vic_of_match[] __initconst = {
-        { .compatible = "arm,pl192-vic" },
+        { .compatible = "arm,pl192-vic", .data = vic_of_init, },
         { /* Sentinel */ }
 };
 
 static void __init picoxcell_init_irq(void)
 {
-        vic_init(IO_ADDRESS(PICOXCELL_VIC0_BASE), 0, ~0, 0);
-        vic_init(IO_ADDRESS(PICOXCELL_VIC1_BASE), 32, ~0, 0);
-        irq_domain_generate_simple(vic_of_match, PICOXCELL_VIC0_BASE, 0);
-        irq_domain_generate_simple(vic_of_match, PICOXCELL_VIC1_BASE, 32);
+        of_irq_init(vic_of_match);
 }
 
 DT_MACHINE_START(PICOXCELL, "Picochip picoXcell")
         .map_io         = picoxcell_map_io,
-        .nr_irqs        = ARCH_NR_IRQS,
+        .nr_irqs        = NR_IRQS_LEGACY,
         .init_irq       = picoxcell_init_irq,
+        .handle_irq     = vic_handle_irq,
         .timer          = &picoxcell_timer,
         .init_machine   = picoxcell_init_machine,
         .dt_compat      = picoxcell_dt_match,