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

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

diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index 5cc5ed44d9af7836322210e12421882be4b0bb60..ffbf5bc7366bce549bb4843606dabd728e624b26 100644 (file)
--- 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>
@@ -198,7 +199,7 @@ static struct resource lcdc_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 106,
+               .start  = evt2irq(0xf40),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -225,7 +226,7 @@ static struct resource ceu0_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 52,
+               .start  = evt2irq(0x880),
                .flags  = IORESOURCE_IRQ,
        },
        [2] = {
@@ -256,7 +257,7 @@ static struct resource ceu1_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 63,
+               .start  = evt2irq(0x9e0),
                .flags  = IORESOURCE_IRQ,
        },
        [2] = {
@@ -290,7 +291,7 @@ static struct resource fsi_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 108,
+               .start  = evt2irq(0xf80),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -352,7 +353,7 @@ static struct resource keysc_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 79,
+               .start  = evt2irq(0xbe0),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -375,7 +376,7 @@ static struct resource sh_eth_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        [1] = {
-               .start = 91,
+               .start = evt2irq(0xd60),
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
        },
 };
@@ -406,8 +407,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,
        },
 };
@@ -435,8 +436,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,
        },
 };
@@ -461,7 +462,7 @@ static struct resource sdhi0_cn7_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 100,
+               .start  = evt2irq(0xe80),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -490,7 +491,7 @@ static struct resource sdhi1_cn8_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 23,
+               .start  = evt2irq(0x4e0),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -520,7 +521,7 @@ static struct resource irda_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 20,
+               .start  = evt2irq(0x480),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -558,7 +559,7 @@ static struct resource sh_vou_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 55,
+               .start  = evt2irq(0x8e0),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -604,6 +605,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;
@@ -660,7 +662,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 */
@@ -937,5 +938,4 @@ device_initcall(devices_setup);
 static struct sh_machine_vector mv_ms7724se __initmv = {
        .mv_name        = "ms7724se",
        .mv_init_irq    = init_se7724_IRQ,
-       .mv_nr_irqs     = SE7724_FPGA_IRQ_BASE + SE7724_FPGA_IRQ_NR,
 };