1 files changed, 12 insertions, 19 deletions

diff --git a/arch/sh/kernel/cpu/sh4a/setup-shx3.c b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
index 688f7ed1bab..bb208806dc1 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-shx3.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
@@ -14,7 +14,6 @@
 #include <linux/io.h>
 #include <linux/gpio.h>
 #include <linux/sh_timer.h>
-#include <linux/sh_intc.h>
 #include <cpu/shx3.h>
 #include <asm/mmzone.h>
 
@@ -33,10 +32,7 @@ static struct plat_sci_port scif0_platform_data = {
         .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
         .scbrr_algo_id  = SCBRR_ALGO_2,
         .type           = PORT_SCIF,
-        .irqs           = { evt2irq(0x700),
-                            evt2irq(0x720),
-                            evt2irq(0x760),
-                            evt2irq(0x740) },
+        .irqs           = { 40, 41, 43, 42 },
 };
 
 static struct platform_device scif0_device = {
@@ -53,10 +49,7 @@ static struct plat_sci_port scif1_platform_data = {
         .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
         .scbrr_algo_id  = SCBRR_ALGO_2,
         .type           = PORT_SCIF,
-        .irqs           = { evt2irq(0x780),
-                            evt2irq(0x7a0),
-                            evt2irq(0x7e0),
-                            evt2irq(0x7c0) },
+        .irqs           = { 44, 45, 47, 46 },
 };
 
 static struct platform_device scif1_device = {
@@ -73,10 +66,7 @@ static struct plat_sci_port scif2_platform_data = {
         .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
         .scbrr_algo_id  = SCBRR_ALGO_2,
         .type           = PORT_SCIF,
-        .irqs           = { evt2irq(0x880),
-                            evt2irq(0x8a0),
-                            evt2irq(0x8e0),
-                            evt2irq(0x8c0) },
+        .irqs           = { 52, 53, 55, 54 },
 };
 
 static struct platform_device scif2_device = {
@@ -100,7 +90,7 @@ static struct resource tmu0_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = evt2irq(0x400),
+                .start  = 16,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -128,7 +118,7 @@ static struct resource tmu1_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = evt2irq(0x420),
+                .start  = 17,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -155,7 +145,7 @@ static struct resource tmu2_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = evt2irq(0x440),
+                .start  = 18,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -182,7 +172,7 @@ static struct resource tmu3_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = evt2irq(0x460),
+                .start  = 19,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -209,7 +199,7 @@ static struct resource tmu4_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = evt2irq(0x480),
+                .start  = 20,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -236,7 +226,7 @@ static struct resource tmu5_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = evt2irq(0x4a0),
+                .start  = 21,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -494,6 +484,9 @@ void __init plat_irq_setup_pins(int mode)
 
 void __init plat_irq_setup(void)
 {
+        reserve_intc_vectors(vectors_irq, ARRAY_SIZE(vectors_irq));
+        reserve_intc_vectors(vectors_irl, ARRAY_SIZE(vectors_irl));
+
         register_intc_controller(&intc_desc);
 }