|
@@ -13,6 +13,7 @@
|
|
|
#include <linux/serial.h>
|
|
|
#include <linux/serial_sci.h>
|
|
|
#include <linux/sh_timer.h>
|
|
|
+#include <linux/sh_intc.h>
|
|
|
#include <linux/uio_driver.h>
|
|
|
#include <linux/usb/m66592.h>
|
|
|
|
|
@@ -147,20 +148,20 @@ static struct resource sh7722_dmae_resources[] = {
|
|
|
},
|
|
|
{
|
|
|
.name = "error_irq",
|
|
|
- .start = 78,
|
|
|
- .end = 78,
|
|
|
+ .start = evt2irq(0xbc0),
|
|
|
+ .end = evt2irq(0xbc0),
|
|
|
.flags = IORESOURCE_IRQ,
|
|
|
},
|
|
|
{
|
|
|
/* IRQ for channels 0-3 */
|
|
|
- .start = 48,
|
|
|
- .end = 51,
|
|
|
+ .start = evt2irq(0x800),
|
|
|
+ .end = evt2irq(0x860),
|
|
|
.flags = IORESOURCE_IRQ,
|
|
|
},
|
|
|
{
|
|
|
/* IRQ for channels 4-5 */
|
|
|
- .start = 76,
|
|
|
- .end = 77,
|
|
|
+ .start = evt2irq(0xb80),
|
|
|
+ .end = evt2irq(0xba0),
|
|
|
.flags = IORESOURCE_IRQ,
|
|
|
},
|
|
|
};
|
|
@@ -182,7 +183,7 @@ static struct plat_sci_port scif0_platform_data = {
|
|
|
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
|
|
|
.scbrr_algo_id = SCBRR_ALGO_2,
|
|
|
.type = PORT_SCIF,
|
|
|
- .irqs = { 80, 80, 80, 80 },
|
|
|
+ .irqs = SCIx_IRQ_MUXED(evt2irq(0xc00)),
|
|
|
.ops = &sh7722_sci_port_ops,
|
|
|
.regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,
|
|
|
};
|
|
@@ -201,7 +202,7 @@ static struct plat_sci_port scif1_platform_data = {
|
|
|
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
|
|
|
.scbrr_algo_id = SCBRR_ALGO_2,
|
|
|
.type = PORT_SCIF,
|
|
|
- .irqs = { 81, 81, 81, 81 },
|
|
|
+ .irqs = SCIx_IRQ_MUXED(evt2irq(0xc20)),
|
|
|
.ops = &sh7722_sci_port_ops,
|
|
|
.regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,
|
|
|
};
|
|
@@ -220,7 +221,7 @@ static struct plat_sci_port scif2_platform_data = {
|
|
|
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
|
|
|
.scbrr_algo_id = SCBRR_ALGO_2,
|
|
|
.type = PORT_SCIF,
|
|
|
- .irqs = { 82, 82, 82, 82 },
|
|
|
+ .irqs = SCIx_IRQ_MUXED(evt2irq(0xc40)),
|
|
|
.ops = &sh7722_sci_port_ops,
|
|
|
.regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,
|
|
|
};
|
|
@@ -241,17 +242,17 @@ static struct resource rtc_resources[] = {
|
|
|
},
|
|
|
[1] = {
|
|
|
/* Period IRQ */
|
|
|
- .start = 45,
|
|
|
+ .start = evt2irq(0x7a0),
|
|
|
.flags = IORESOURCE_IRQ,
|
|
|
},
|
|
|
[2] = {
|
|
|
/* Carry IRQ */
|
|
|
- .start = 46,
|
|
|
+ .start = evt2irq(0x7c0),
|
|
|
.flags = IORESOURCE_IRQ,
|
|
|
},
|
|
|
[3] = {
|
|
|
/* Alarm IRQ */
|
|
|
- .start = 44,
|
|
|
+ .start = evt2irq(0x780),
|
|
|
.flags = IORESOURCE_IRQ,
|
|
|
},
|
|
|
};
|
|
@@ -275,8 +276,8 @@ static struct resource usbf_resources[] = {
|
|
|
.flags = IORESOURCE_MEM,
|
|
|
},
|
|
|
[1] = {
|
|
|
- .start = 65,
|
|
|
- .end = 65,
|
|
|
+ .start = evt2irq(0xa20),
|
|
|
+ .end = evt2irq(0xa20),
|
|
|
.flags = IORESOURCE_IRQ,
|
|
|
},
|
|
|
};
|
|
@@ -301,8 +302,8 @@ static struct resource iic_resources[] = {
|
|
|
.flags = IORESOURCE_MEM,
|
|
|
},
|
|
|
[1] = {
|
|
|
- .start = 96,
|
|
|
- .end = 99,
|
|
|
+ .start = evt2irq(0xe00),
|
|
|
+ .end = evt2irq(0xe60),
|
|
|
.flags = IORESOURCE_IRQ,
|
|
|
},
|
|
|
};
|
|
@@ -317,7 +318,7 @@ static struct platform_device iic_device = {
|
|
|
static struct uio_info vpu_platform_data = {
|
|
|
.name = "VPU4",
|
|
|
.version = "0",
|
|
|
- .irq = 60,
|
|
|
+ .irq = evt2irq(0x980),
|
|
|
};
|
|
|
|
|
|
static struct resource vpu_resources[] = {
|
|
@@ -345,7 +346,7 @@ static struct platform_device vpu_device = {
|
|
|
static struct uio_info veu_platform_data = {
|
|
|
.name = "VEU",
|
|
|
.version = "0",
|
|
|
- .irq = 54,
|
|
|
+ .irq = evt2irq(0x8c0),
|
|
|
};
|
|
|
|
|
|
static struct resource veu_resources[] = {
|
|
@@ -373,7 +374,7 @@ static struct platform_device veu_device = {
|
|
|
static struct uio_info jpu_platform_data = {
|
|
|
.name = "JPU",
|
|
|
.version = "0",
|
|
|
- .irq = 27,
|
|
|
+ .irq = evt2irq(0x560),
|
|
|
};
|
|
|
|
|
|
static struct resource jpu_resources[] = {
|
|
@@ -412,7 +413,7 @@ static struct resource cmt_resources[] = {
|
|
|
.flags = IORESOURCE_MEM,
|
|
|
},
|
|
|
[1] = {
|
|
|
- .start = 104,
|
|
|
+ .start = evt2irq(0xf00),
|
|
|
.flags = IORESOURCE_IRQ,
|
|
|
},
|
|
|
};
|
|
@@ -440,7 +441,7 @@ static struct resource tmu0_resources[] = {
|
|
|
.flags = IORESOURCE_MEM,
|
|
|
},
|
|
|
[1] = {
|
|
|
- .start = 16,
|
|
|
+ .start = evt2irq(0x400),
|
|
|
.flags = IORESOURCE_IRQ,
|
|
|
},
|
|
|
};
|
|
@@ -468,7 +469,7 @@ static struct resource tmu1_resources[] = {
|
|
|
.flags = IORESOURCE_MEM,
|
|
|
},
|
|
|
[1] = {
|
|
|
- .start = 17,
|
|
|
+ .start = evt2irq(0x420),
|
|
|
.flags = IORESOURCE_IRQ,
|
|
|
},
|
|
|
};
|
|
@@ -525,7 +526,7 @@ static struct resource siu_resources[] = {
|
|
|
.flags = IORESOURCE_MEM,
|
|
|
},
|
|
|
[1] = {
|
|
|
- .start = 108,
|
|
|
+ .start = evt2irq(0xf80),
|
|
|
.flags = IORESOURCE_IRQ,
|
|
|
},
|
|
|
};
|