Merge tag 'for-linus-3.5-20120601' of git://git.infradead.org/linux-mtd

[uclinux-h8/linux.git] / arch / sh / boards / mach-migor / setup.c

diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index de3e0f6..a8a1ca7 100644 (file)
--- 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,
        },
 };
@@ -284,7 +285,7 @@ static struct resource migor_lcdc_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 28,
+               .start  = evt2irq(0x580),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -367,7 +368,7 @@ static struct resource migor_ceu_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 52,
+               .start  = evt2irq(0x880),
                .flags  = IORESOURCE_IRQ,
        },
        [2] = {
@@ -393,7 +394,7 @@ static struct resource sdhi_cn9_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 100,
+               .start  = evt2irq(0xe80),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -419,7 +420,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),