sh: edosk7760 evt2irq migration.

Migrate edosk7760 to evt2irq() backed hwirq lookups.

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

2 files changed, 7 insertions, 10 deletions

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/include/asm/i2c-sh7760.h b/arch/sh/include/asm/i2c-sh7760.h
index 24182116711f..69fee1239b03 100644
--- a/arch/sh/include/asm/i2c-sh7760.h
+++ b/arch/sh/include/asm/i2c-sh7760.h
@@ -9,11 +9,9 @@
 
 #define SH7760_I2C0_MMIO        0xFE140000
 #define SH7760_I2C0_MMIOEND     0xFE14003B
-#define SH7760_I2C0_IRQ         62
 
 #define SH7760_I2C1_MMIO        0xFE150000
 #define SH7760_I2C1_MMIOEND     0xFE15003B
-#define SH7760_I2C1_IRQ         63
 
 struct sh7760_i2c_platdata {
         unsigned int speed_khz;