]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
sh: sh7343 scif configuration update
authorMagnus Damm <damm@igel.co.jp>
Thu, 4 Dec 2008 08:59:54 +0000 (17:59 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 22 Dec 2008 09:43:51 +0000 (18:43 +0900)
Fix interrupt values for the first sh7343 SCIF port and
update the configuration to include the remaining 3 ones.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/sh/kernel/cpu/sh4a/setup-sh7343.c

index 75b9c819e4420d7f95c5035123dfa2bfb44895ba..0623e377f488c7f30b2d388b470a8ac49bd879ef 100644 (file)
@@ -117,7 +117,22 @@ static struct plat_sci_port sci_platform_data[] = {
                .mapbase        = 0xffe00000,
                .flags          = UPF_BOOT_AUTOCONF,
                .type           = PORT_SCIF,
-               .irqs           = { 80, 81, 83, 82 },
+               .irqs           = { 80, 80, 80, 80 },
+       }, {
+               .mapbase        = 0xffe10000,
+               .flags          = UPF_BOOT_AUTOCONF,
+               .type           = PORT_SCIF,
+               .irqs           = { 81, 81, 81, 81 },
+       }, {
+               .mapbase        = 0xffe20000,
+               .flags          = UPF_BOOT_AUTOCONF,
+               .type           = PORT_SCIF,
+               .irqs           = { 82, 82, 82, 82 },
+       }, {
+               .mapbase        = 0xffe30000,
+               .flags          = UPF_BOOT_AUTOCONF,
+               .type           = PORT_SCIF,
+               .irqs           = { 83, 83, 83, 83 },
        }, {
                .flags = 0,
        }
@@ -165,7 +180,7 @@ enum {
        MMC_ERR, MMC_TRAN, MMC_FSTAT, MMC_FRDY,
        DMAC4, DMAC5, DMAC_DADERR,
        KEYSC,
-       SCIF, SCIF1, SCIF2, SCIF3, SCIF4,
+       SCIF, SCIF1, SCIF2, SCIF3,
        SIOF0, SIOF1, SIO,
        FLCTL_FLSTEI, FLCTL_FLENDI, FLCTL_FLTREQ0I, FLCTL_FLTREQ1I,
        I2C0_ALI, I2C0_TACKI, I2C0_WAITI, I2C0_DTEI,