Merge tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[linux-beck.git] / arch / sh / boards / mach-ecovec24 / setup.c

diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 299a40a44c92d1b9ef3dd785d02b019659011c14..4158d70c0dea3675e44582be719b57076876bb04 100644 (file)
--- 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>
@@ -138,7 +139,7 @@ static struct resource sh_eth_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        [1] = {
-               .start = 91,
+               .start = evt2irq(0xd60),
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
        },
 };
@@ -179,8 +180,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,
        },
 };
@@ -215,8 +216,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,
        },
 };
@@ -262,8 +263,8 @@ static struct resource usbhs_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 66,
-               .end    = 66,
+               .start  = evt2irq(0xa40),
+               .end    = evt2irq(0xa40),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -349,7 +350,7 @@ static struct resource lcdc_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 106,
+               .start  = evt2irq(0xf40),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -376,7 +377,7 @@ static struct resource ceu0_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 52,
+               .start  = evt2irq(0x880),
                .flags  = IORESOURCE_IRQ,
        },
        [2] = {
@@ -407,7 +408,7 @@ static struct resource ceu1_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 63,
+               .start  = evt2irq(0x9e0),
                .flags  = IORESOURCE_IRQ,
        },
        [2] = {
@@ -438,7 +439,7 @@ static struct i2c_board_info i2c1_devices[] = {
        },
        {
                I2C_BOARD_INFO("lis3lv02d", 0x1c),
-               .irq = 33,
+               .irq = evt2irq(0x620),
        }
 };
 
@@ -464,7 +465,7 @@ static struct resource keysc_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 79,
+               .start  = evt2irq(0xbe0),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -480,7 +481,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;
@@ -545,7 +547,7 @@ static struct resource sdhi0_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 100,
+               .start  = evt2irq(0xe80),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -589,7 +591,7 @@ static struct resource sdhi1_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 23,
+               .start  = evt2irq(0x4e0),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -654,7 +656,7 @@ static struct resource msiof0_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 84,
+               .start  = evt2irq(0xc80),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -795,7 +797,7 @@ static struct resource fsi_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 108,
+               .start  = evt2irq(0xf80),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -843,7 +845,7 @@ static struct resource irda_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 20,
+               .start  = evt2irq(0x480),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -880,7 +882,7 @@ static struct resource sh_vou_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 55,
+               .start  = evt2irq(0x8e0),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -916,12 +918,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,
        },
 };