Merge branch 'sh/evt2irq-migration' into sh-latest

Conflicts:
	arch/sh/kernel/cpu/sh3/setup-sh770x.c
	arch/sh/kernel/cpu/sh3/setup-sh7710.c
	arch/sh/kernel/cpu/sh3/setup-sh7720.c
	arch/sh/kernel/cpu/sh4/setup-sh7750.c
	arch/sh/kernel/cpu/sh4a/setup-sh7343.c
	arch/sh/kernel/cpu/sh4a/setup-sh7366.c
	arch/sh/kernel/cpu/sh4a/setup-sh7722.c
	arch/sh/kernel/cpu/sh4a/setup-sh7723.c
	arch/sh/kernel/cpu/sh4a/setup-sh7724.c
	arch/sh/kernel/cpu/sh4a/setup-sh7757.c
	arch/sh/kernel/cpu/sh4a/setup-sh7763.c
	arch/sh/kernel/cpu/sh4a/setup-sh7770.c
	arch/sh/kernel/cpu/sh4a/setup-sh7785.c
	arch/sh/kernel/cpu/sh4a/setup-sh7786.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

15 files changed, 118 insertions, 104 deletions

diff --git a/arch/sh/boards/board-edosk7705.c b/arch/sh/boards/board-edosk7705.c
index 541d8a281035..0a531a1f6e23 100644
--- a/arch/sh/boards/board-edosk7705.c
+++ b/arch/sh/boards/board-edosk7705.c
@@ -13,6 +13,7 @@
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/smc91x.h>
+#include <linux/sh_intc.h>
 #include <asm/machvec.h>
 #include <asm/sizes.h>
 
@@ -20,7 +21,7 @@
 #define SMC_IO_OFFSET   0x300
 #define SMC_IOADDR      (SMC_IOBASE + SMC_IO_OFFSET)
 
-#define ETHERNET_IRQ    0x09
+#define ETHERNET_IRQ    evt2irq(0x320)
 
 static void __init sh_edosk7705_init_irq(void)
 {
diff --git a/arch/sh/boards/board-edosk7760.c b/arch/sh/boards/board-edosk7760.c
index e9656a2cc4cc..d4871d274fb9 100644
--- a/arch/sh/boards/board-edosk7760.c
+++ b/arch/sh/boards/board-edosk7760.c
@@ -23,6 +23,7 @@
 #include <linux/platform_device.h>
 #include <linux/smc91x.h>
 #include <linux/interrupt.h>
+#include <linux/sh_intc.h>
 #include <linux/i2c.h>
 #include <linux/mtd/physmap.h>
 #include <asm/machvec.h>
@@ -40,8 +41,6 @@
 #define SMC_IO_OFFSET   0x300
 #define SMC_IOADDR      (SMC_IOBASE + SMC_IO_OFFSET)
 
-#define ETHERNET_IRQ    5
-
 /* NOR flash */
 static struct mtd_partition edosk7760_nor_flash_partitions[] = {
         {
@@ -99,8 +98,8 @@ static struct resource sh7760_i2c1_res[] = {
                 .end    = SH7760_I2C1_MMIOEND,
                 .flags  = IORESOURCE_MEM,
         },{
-                .start  = SH7760_I2C1_IRQ,
-                .end    = SH7760_I2C1_IRQ,
+                .start  = evt2irq(0x9e0),
+                .end    = evt2irq(0x9e0),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -122,8 +121,8 @@ static struct resource sh7760_i2c0_res[] = {
                 .end    = SH7760_I2C0_MMIOEND,
                 .flags  = IORESOURCE_MEM,
         }, {
-                .start  = SH7760_I2C0_IRQ,
-                .end    = SH7760_I2C0_IRQ,
+                .start  = evt2irq(0x9c0),
+                .end    = evt2irq(0x9c0),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -150,8 +149,8 @@ static struct resource smc91x_res[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = ETHERNET_IRQ,
-                .end    = ETHERNET_IRQ,
+                .start  = evt2irq(0x2a0),
+                .end    = evt2irq(0x2a0),
                 .flags  = IORESOURCE_IRQ ,
         }
 };
diff --git a/arch/sh/boards/board-espt.c b/arch/sh/boards/board-espt.c
index b3ae9d38cbc0..6cba0a7068bc 100644
--- a/arch/sh/boards/board-espt.c
+++ b/arch/sh/boards/board-espt.c
@@ -14,6 +14,7 @@
 #include <linux/mtd/physmap.h>
 #include <linux/io.h>
 #include <linux/sh_eth.h>
+#include <linux/sh_intc.h>
 #include <asm/machvec.h>
 #include <asm/sizes.h>
 
@@ -71,7 +72,7 @@ static struct resource sh_eth_resources[] = {
                 .flags  = IORESOURCE_MEM,
         }, {
 
-                .start  = 57,   /* irq number */
+                .start  = evt2irq(0x920),   /* irq number */
                 .flags  = IORESOURCE_IRQ,
         },
 };
diff --git a/arch/sh/boards/board-magicpanelr2.c b/arch/sh/boards/board-magicpanelr2.c
index b2ca1d9948fb..90568f9de3a4 100644
--- a/arch/sh/boards/board-magicpanelr2.c
+++ b/arch/sh/boards/board-magicpanelr2.c
@@ -19,6 +19,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/mtd/map.h>
+#include <linux/sh_intc.h>
 #include <mach/magicpanelr2.h>
 #include <asm/heartbeat.h>
 #include <cpu/sh7720.h>
@@ -245,8 +246,8 @@ static struct resource smsc911x_resources[] = {
                 .flags          = IORESOURCE_MEM,
         },
         [1] = {
-                .start          = 35,
-                .end            = 35,
+                .start          = evt2irq(0x660),
+                .end            = evt2irq(0x660),
                 .flags          = IORESOURCE_IRQ,
         },
 };
@@ -358,17 +359,17 @@ static void __init init_mpr2_IRQ(void)
 {
         plat_irq_setup_pins(IRQ_MODE_IRQ); /* install handlers for IRQ0-5 */
 
-        irq_set_irq_type(32, IRQ_TYPE_LEVEL_LOW);    /* IRQ0 CAN1 */
-        irq_set_irq_type(33, IRQ_TYPE_LEVEL_LOW);    /* IRQ1 CAN2 */
-        irq_set_irq_type(34, IRQ_TYPE_LEVEL_LOW);    /* IRQ2 CAN3 */
-        irq_set_irq_type(35, IRQ_TYPE_LEVEL_LOW);    /* IRQ3 SMSC9115 */
-        irq_set_irq_type(36, IRQ_TYPE_EDGE_RISING);  /* IRQ4 touchscreen */
-        irq_set_irq_type(37, IRQ_TYPE_EDGE_FALLING); /* IRQ5 touchscreen */
-
-        intc_set_priority(32, 13);              /* IRQ0 CAN1 */
-        intc_set_priority(33, 13);              /* IRQ0 CAN2 */
-        intc_set_priority(34, 13);              /* IRQ0 CAN3 */
-        intc_set_priority(35, 6);               /* IRQ3 SMSC9115 */
+        irq_set_irq_type(evt2irq(0x600), IRQ_TYPE_LEVEL_LOW);    /* IRQ0 CAN1 */
+        irq_set_irq_type(evt2irq(0x620), IRQ_TYPE_LEVEL_LOW);    /* IRQ1 CAN2 */
+        irq_set_irq_type(evt2irq(0x640), IRQ_TYPE_LEVEL_LOW);    /* IRQ2 CAN3 */
+        irq_set_irq_type(evt2irq(0x660), IRQ_TYPE_LEVEL_LOW);    /* IRQ3 SMSC9115 */
+        irq_set_irq_type(evt2irq(0x680), IRQ_TYPE_EDGE_RISING);  /* IRQ4 touchscreen */
+        irq_set_irq_type(evt2irq(0x6a0), IRQ_TYPE_EDGE_FALLING); /* IRQ5 touchscreen */
+
+        intc_set_priority(evt2irq(0x600), 13);          /* IRQ0 CAN1 */
+        intc_set_priority(evt2irq(0x620), 13);          /* IRQ0 CAN2 */
+        intc_set_priority(evt2irq(0x640), 13);          /* IRQ0 CAN3 */
+        intc_set_priority(evt2irq(0x660), 6);           /* IRQ3 SMSC9115 */
 }
 
 /*
diff --git a/arch/sh/boards/board-sh7757lcr.c b/arch/sh/boards/board-sh7757lcr.c
index 24b1ee410daa..5087f8bb4cff 100644
--- a/arch/sh/boards/board-sh7757lcr.c
+++ b/arch/sh/boards/board-sh7757lcr.c
@@ -19,6 +19,7 @@
 #include <linux/mmc/sh_mmcif.h>
 #include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/sh_eth.h>
+#include <linux/sh_intc.h>
 #include <linux/usb/renesas_usbhs.h>
 #include <cpu/sh7757.h>
 #include <asm/heartbeat.h>
@@ -65,8 +66,8 @@ static struct resource sh_eth0_resources[] = {
                 .end    = 0xfef001ff,
                 .flags  = IORESOURCE_MEM,
         }, {
-                .start  = 84,
-                .end    = 84,
+                .start  = evt2irq(0xc80),
+                .end    = evt2irq(0xc80),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -94,8 +95,8 @@ static struct resource sh_eth1_resources[] = {
                 .end    = 0xfef009ff,
                 .flags  = IORESOURCE_MEM,
         }, {
-                .start  = 84,
-                .end    = 84,
+                .start  = evt2irq(0xc80),
+                .end    = evt2irq(0xc80),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -139,8 +140,8 @@ static struct resource sh_eth_giga0_resources[] = {
                 .end    = 0xfee01fff,
                 .flags  = IORESOURCE_MEM,
         }, {
-                .start  = 315,
-                .end    = 315,
+                .start  = evt2irq(0x2960),
+                .end    = evt2irq(0x2960),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -174,8 +175,8 @@ static struct resource sh_eth_giga1_resources[] = {
                 .end    = 0xfee01fff,
                 .flags  = IORESOURCE_MEM,
         }, {
-                .start  = 316,
-                .end    = 316,
+                .start  = evt2irq(0x2980),
+                .end    = evt2irq(0x2980),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -206,11 +207,11 @@ static struct resource sh_mmcif_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 211,
+                .start  = evt2irq(0x1c60),
                 .flags  = IORESOURCE_IRQ,
         },
         [2] = {
-                .start  = 212,
+                .start  = evt2irq(0x1c80),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -248,7 +249,7 @@ static struct resource sdhi_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 20,
+                .start  = evt2irq(0x480),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -284,8 +285,8 @@ static struct resource usb0_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 50,
-                .end    = 50,
+                .start  = evt2irq(0x840),
+                .end    = evt2irq(0x840),
                 .flags  = IORESOURCE_IRQ,
         },
 };
diff --git a/arch/sh/boards/board-sh7785lcr.c b/arch/sh/boards/board-sh7785lcr.c
index d0d6221d7c2e..2c4771ee84cd 100644
--- a/arch/sh/boards/board-sh7785lcr.c
+++ b/arch/sh/boards/board-sh7785lcr.c
@@ -20,6 +20,7 @@
 #include <linux/i2c-pca-platform.h>
 #include <linux/i2c-algo-pca.h>
 #include <linux/usb/r8a66597.h>
+#include <linux/sh_intc.h>
 #include <linux/irq.h>
 #include <linux/io.h>
 #include <linux/clk.h>
@@ -105,8 +106,8 @@ static struct resource r8a66597_usb_host_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 2,
-                .end    = 2,
+                .start  = evt2irq(0x240),
+                .end    = evt2irq(0x240),
                 .flags  = IORESOURCE_IRQ | IRQF_TRIGGER_LOW,
         },
 };
@@ -135,7 +136,7 @@ static struct resource sm501_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [2]     = {
-                .start  = 10,
+                .start  = evt2irq(0x340),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -223,8 +224,8 @@ static struct resource i2c_proto_resources[] = {
                 .flags  = IORESOURCE_MEM | IORESOURCE_MEM_8BIT,
         },
         [1] = {
-                .start  = 12,
-                .end    = 12,
+                .start  = evt2irq(0x380),
+                .end    = evt2irq(0x380),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -236,8 +237,8 @@ static struct resource i2c_resources[] = {
                 .flags  = IORESOURCE_MEM | IORESOURCE_MEM_8BIT,
         },
         [1] = {
-                .start  = 12,
-                .end    = 12,
+                .start  = evt2irq(0x380),
+                .end    = evt2irq(0x380),
                 .flags  = IORESOURCE_IRQ,
         },
 };
diff --git a/arch/sh/boards/board-urquell.c b/arch/sh/boards/board-urquell.c
index 24e3316c5c17..b52abcc5259a 100644
--- a/arch/sh/boards/board-urquell.c
+++ b/arch/sh/boards/board-urquell.c
@@ -20,6 +20,7 @@
 #include <linux/gpio.h>
 #include <linux/irq.h>
 #include <linux/clk.h>
+#include <linux/sh_intc.h>
 #include <mach/urquell.h>
 #include <cpu/sh7786.h>
 #include <asm/heartbeat.h>
@@ -78,7 +79,7 @@ static struct resource smc91x_eth_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 11,
+                .start  = evt2irq(0x360),
                 .flags  = IORESOURCE_IRQ,
         },
 };
diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c
index 8cf02e343333..f33ebf447073 100644
--- a/arch/sh/boards/mach-ap325rxa/setup.c
+++ b/arch/sh/boards/mach-ap325rxa/setup.c
@@ -23,6 +23,7 @@
 #include <linux/smsc911x.h>
 #include <linux/gpio.h>
 #include <linux/videodev2.h>
+#include <linux/sh_intc.h>
 #include <media/ov772x.h>
 #include <media/soc_camera.h>
 #include <media/soc_camera_platform.h>
@@ -47,8 +48,8 @@ static struct resource smsc9118_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 35,
-                .end    = 35,
+                .start  = evt2irq(0x660),
+                .end    = evt2irq(0x660),
                 .flags  = IORESOURCE_IRQ,
         }
 };
@@ -166,7 +167,7 @@ static int ap320_wvga_set_brightness(int brightness)
                 __raw_writew(0, FPGA_BKLREG);
                 gpio_set_value(GPIO_PTS3, 1);
         }
-        
+
         return 0;
 }
 
@@ -236,7 +237,7 @@ static struct resource lcdc_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 28,
+                .start  = evt2irq(0x580),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -404,7 +405,7 @@ static struct resource ceu_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 52,
+                .start  = evt2irq(0x880),
                 .flags  = IORESOURCE_IRQ,
         },
         [2] = {
@@ -430,7 +431,7 @@ static struct resource sdhi0_cn3_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 100,
+                .start  = evt2irq(0xe80),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -457,7 +458,7 @@ static struct resource sdhi1_cn7_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 23,
+                .start  = evt2irq(0x4e0),
                 .flags  = IORESOURCE_IRQ,
         },
 };
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index d12fe9ddf3da..63002c8a0ec8 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -29,6 +29,7 @@
 #include <linux/input.h>
 #include <linux/input/sh_keysc.h>
 #include <linux/sh_eth.h>
+#include <linux/sh_intc.h>
 #include <linux/videodev2.h>
 #include <video/sh_mobile_lcdc.h>
 #include <sound/sh_fsi.h>
@@ -137,7 +138,7 @@ static struct resource sh_eth_resources[] = {
                 .flags = IORESOURCE_MEM,
         },
         [1] = {
-                .start = 91,
+                .start = evt2irq(0xd60),
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
         },
 };
@@ -178,8 +179,8 @@ static struct resource usb0_host_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 65,
-                .end    = 65,
+                .start  = evt2irq(0xa20),
+                .end    = evt2irq(0xa20),
                 .flags  = IORESOURCE_IRQ | IRQF_TRIGGER_LOW,
         },
 };
@@ -214,8 +215,8 @@ static struct resource usb1_common_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 66,
-                .end    = 66,
+                .start  = evt2irq(0xa40),
+                .end    = evt2irq(0xa40),
                 .flags  = IORESOURCE_IRQ | IRQF_TRIGGER_LOW,
         },
 };
@@ -261,8 +262,8 @@ static struct resource usbhs_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 66,
-                .end    = 66,
+                .start  = evt2irq(0xa40),
+                .end    = evt2irq(0xa40),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -348,7 +349,7 @@ static struct resource lcdc_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 106,
+                .start  = evt2irq(0xf40),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -375,7 +376,7 @@ static struct resource ceu0_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 52,
+                .start  = evt2irq(0x880),
                 .flags  = IORESOURCE_IRQ,
         },
         [2] = {
@@ -406,7 +407,7 @@ static struct resource ceu1_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 63,
+                .start  = evt2irq(0x9e0),
                 .flags  = IORESOURCE_IRQ,
         },
         [2] = {
@@ -437,7 +438,7 @@ static struct i2c_board_info i2c1_devices[] = {
         },
         {
                 I2C_BOARD_INFO("lis3lv02d", 0x1c),
-                .irq = 33,
+                .irq = evt2irq(0x620),
         }
 };
 
@@ -463,7 +464,7 @@ static struct resource keysc_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 79,
+                .start  = evt2irq(0xbe0),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -479,7 +480,8 @@ static struct platform_device keysc_device = {
 };
 
 /* TouchScreen */
-#define IRQ0 32
+#define IRQ0 evt2irq(0x600)
+
 static int ts_get_pendown_state(void)
 {
         int val = 0;
@@ -544,7 +546,7 @@ static struct resource sdhi0_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 100,
+                .start  = evt2irq(0xe80),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -588,7 +590,7 @@ static struct resource sdhi1_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 23,
+                .start  = evt2irq(0x4e0),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -653,7 +655,7 @@ static struct resource msiof0_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 84,
+                .start  = evt2irq(0xc80),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -794,7 +796,7 @@ static struct resource fsi_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 108,
+                .start  = evt2irq(0xf80),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -818,7 +820,7 @@ static struct resource irda_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 20,
+                .start  = evt2irq(0x480),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -855,7 +857,7 @@ static struct resource sh_vou_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 55,
+                .start  = evt2irq(0x8e0),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -891,12 +893,12 @@ static struct resource sh_mmcif_resources[] = {
         },
         [1] = {
                 /* MMC2I */
-                .start  = 29,
+                .start  = evt2irq(0x5a0),
                 .flags  = IORESOURCE_IRQ,
         },
         [2] = {
                 /* MMC3I */
-                .start  = 30,
+                .start  = evt2irq(0x5c0),
                 .flags  = IORESOURCE_IRQ,
         },
 };
diff --git a/arch/sh/boards/mach-hp6xx/setup.c b/arch/sh/boards/mach-hp6xx/setup.c
index 8c9add5f4cfa..db34cad1b76c 100644
--- a/arch/sh/boards/mach-hp6xx/setup.c
+++ b/arch/sh/boards/mach-hp6xx/setup.c
@@ -13,6 +13,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/irq.h>
+#include <linux/sh_intc.h>
 #include <sound/sh_dac_audio.h>
 #include <asm/hd64461.h>
 #include <asm/io.h>
@@ -35,7 +36,7 @@ static struct resource cf_ide_resources[] = {
                 .flags = IORESOURCE_MEM,
         },
         [2] = {
-                .start = 77,
+                .start = evt2irq(0xba0),
                 .flags = IORESOURCE_IRQ,
         },
 };
diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c
index d04a55d3b877..158c9176e42a 100644
--- a/arch/sh/boards/mach-kfr2r09/setup.c
+++ b/arch/sh/boards/mach-kfr2r09/setup.c
@@ -23,6 +23,7 @@
 #include <linux/i2c.h>
 #include <linux/usb/r8a66597.h>
 #include <linux/videodev2.h>
+#include <linux/sh_intc.h>
 #include <media/rj54n1cb0c.h>
 #include <media/soc_camera.h>
 #include <media/sh_mobile_ceu.h>
@@ -110,7 +111,7 @@ static struct resource kfr2r09_sh_keysc_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 79,
+                .start  = evt2irq(0xbe0),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -175,7 +176,7 @@ static struct resource kfr2r09_sh_lcdc_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 106,
+                .start  = evt2irq(0xf40),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -200,8 +201,8 @@ static struct resource kfr2r09_usb0_gadget_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 65,
-                .end    = 65,
+                .start  = evtirq(0xa20),
+                .end    = evtirq(0xa20),
                 .flags  = IORESOURCE_IRQ | IRQF_TRIGGER_LOW,
         },
 };
@@ -230,8 +231,8 @@ static struct resource kfr2r09_ceu_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 52,
-                .end  = 52,
+                .start  = evt2irq(0x880),
+                .end    = evt2irq(0x880),
                 .flags  = IORESOURCE_IRQ,
         },
         [2] = {
@@ -348,7 +349,7 @@ static struct resource kfr2r09_sh_sdhi0_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 100,
+                .start  = evt2irq(0xe80),
                 .flags  = IORESOURCE_IRQ,
         },
 };
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index ff6f69c6906e..34cd0c5ff2e1 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -22,6 +22,7 @@
 #include <linux/clk.h>
 #include <linux/gpio.h>
 #include <linux/videodev2.h>
+#include <linux/sh_intc.h>
 #include <video/sh_mobile_lcdc.h>
 #include <media/sh_mobile_ceu.h>
 #include <media/ov772x.h>
@@ -54,7 +55,7 @@ static struct resource smc91x_eth_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 32, /* IRQ0 */
+                .start  = evt2irq(0x600), /* IRQ0 */
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
         },
 };
@@ -88,7 +89,7 @@ static struct resource sh_keysc_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 79,
+                .start  = evt2irq(0xbe0),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -285,7 +286,7 @@ static struct resource migor_lcdc_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 28,
+                .start  = evt2irq(0x580),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -368,7 +369,7 @@ static struct resource migor_ceu_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 52,
+                .start  = evt2irq(0x880),
                 .flags  = IORESOURCE_IRQ,
         },
         [2] = {
@@ -394,7 +395,7 @@ static struct resource sdhi_cn9_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 100,
+                .start  = evt2irq(0xe80),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -420,7 +421,7 @@ static struct i2c_board_info migor_i2c_devices[] = {
         },
         {
                 I2C_BOARD_INFO("migor_ts", 0x51),
-                .irq = 38, /* IRQ6 */
+                .irq = evt2irq(0x6c0), /* IRQ6 */
         },
         {
                 I2C_BOARD_INFO("wm8978", 0x1a),
diff --git a/arch/sh/boards/mach-se/7722/setup.c b/arch/sh/boards/mach-se/7722/setup.c
index e1963fecd761..8f7f0550cfde 100644
--- a/arch/sh/boards/mach-se/7722/setup.c
+++ b/arch/sh/boards/mach-se/7722/setup.c
@@ -16,6 +16,7 @@
 #include <linux/input.h>
 #include <linux/input/sh_keysc.h>
 #include <linux/smc91x.h>
+#include <linux/sh_intc.h>
 #include <mach-se/mach/se7722.h>
 #include <mach-se/mach/mrshpc.h>
 #include <asm/machvec.h>
@@ -114,7 +115,7 @@ static struct resource sh_keysc_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 79,
+                .start  = evt2irq(0xbe0),
                 .flags  = IORESOURCE_IRQ,
         },
 };
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index c540b16547c3..479cdf876fda 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -24,6 +24,7 @@
 #include <linux/input/sh_keysc.h>
 #include <linux/usb/r8a66597.h>
 #include <linux/sh_eth.h>
+#include <linux/sh_intc.h>
 #include <linux/videodev2.h>
 #include <video/sh_mobile_lcdc.h>
 #include <media/sh_mobile_ceu.h>
@@ -197,7 +198,7 @@ static struct resource lcdc_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 106,
+                .start  = evt2irq(0xf40),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -224,7 +225,7 @@ static struct resource ceu0_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 52,
+                .start  = evt2irq(0x880),
                 .flags  = IORESOURCE_IRQ,
         },
         [2] = {
@@ -255,7 +256,7 @@ static struct resource ceu1_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 63,
+                .start  = evt2irq(0x9e0),
                 .flags  = IORESOURCE_IRQ,
         },
         [2] = {
@@ -289,7 +290,7 @@ static struct resource fsi_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 108,
+                .start  = evt2irq(0xf80),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -343,7 +344,7 @@ static struct resource keysc_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 79,
+                .start  = evt2irq(0xbe0),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -366,7 +367,7 @@ static struct resource sh_eth_resources[] = {
                 .flags = IORESOURCE_MEM,
         },
         [1] = {
-                .start = 91,
+                .start = evt2irq(0xd60),
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
         },
 };
@@ -397,8 +398,8 @@ static struct resource sh7724_usb0_host_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 65,
-                .end    = 65,
+                .start  = evt2irq(0xa20),
+                .end    = evt2irq(0xa20),
                 .flags  = IORESOURCE_IRQ | IRQF_TRIGGER_LOW,
         },
 };
@@ -426,8 +427,8 @@ static struct resource sh7724_usb1_gadget_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 66,
-                .end    = 66,
+                .start  = evt2irq(0xa40),
+                .end    = evt2irq(0xa40),
                 .flags  = IORESOURCE_IRQ | IRQF_TRIGGER_LOW,
         },
 };
@@ -452,7 +453,7 @@ static struct resource sdhi0_cn7_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 100,
+                .start  = evt2irq(0xe80),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -481,7 +482,7 @@ static struct resource sdhi1_cn8_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 23,
+                .start  = evt2irq(0x4e0),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -511,7 +512,7 @@ static struct resource irda_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 20,
+                .start  = evt2irq(0x480),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -549,7 +550,7 @@ static struct resource sh_vou_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 55,
+                .start  = evt2irq(0x8e0),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -595,6 +596,7 @@ static struct i2c_board_info i2c0_devices[] = {
 #define EEPROM_DATA 0xBA20600C
 #define EEPROM_STAT 0xBA206010
 #define EEPROM_STRT 0xBA206014
+
 static int __init sh_eth_is_eeprom_ready(void)
 {
         int t = 10000;
@@ -651,7 +653,6 @@ extern char ms7724se_sdram_enter_end;
 extern char ms7724se_sdram_leave_start;
 extern char ms7724se_sdram_leave_end;
 
-
 static int __init arch_setup(void)
 {
         /* enable I2C device */
diff --git a/arch/sh/boards/mach-sh7763rdp/setup.c b/arch/sh/boards/mach-sh7763rdp/setup.c
index dd036f1661db..36e8b88cd04e 100644
--- a/arch/sh/boards/mach-sh7763rdp/setup.c
+++ b/arch/sh/boards/mach-sh7763rdp/setup.c
@@ -18,6 +18,7 @@
 #include <linux/fb.h>
 #include <linux/io.h>
 #include <linux/sh_eth.h>
+#include <linux/sh_intc.h>
 #include <mach/sh7763rdp.h>
 #include <asm/sh7760fb.h>
 
@@ -67,7 +68,7 @@ static struct platform_device sh7763rdp_nor_flash_device = {
  * SH-Ether
  *
  * SH Ether of SH7763 has multi IRQ handling.
- * (57,58,59 -> 57)
+ * (0x920,0x940,0x960 -> 0x920)
  */
 static struct resource sh_eth_resources[] = {
         {
@@ -79,7 +80,7 @@ static struct resource sh_eth_resources[] = {
                 .end    = 0xFEE01FFF,
                 .flags  = IORESOURCE_MEM,
         }, {
-                .start  = 57,   /* irq number */
+                .start  = evt2irq(0x920),   /* irq number */
                 .flags  = IORESOURCE_IRQ,
         },
 };