Skip to content

Commit

Permalink
sh: sh4a: Change the specification method of IRQ to SCIx_IRQ_MUXED
Browse files Browse the repository at this point in the history 
Some SCIF devices specify the same IRQ. We can use SCIx_IRQ_MUXED for this.
And change use to evt2irq(), without specifying the value of IRQ directly.
This is correction to the SH4A series.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Nobuhiro Iwamatsu authored and Paul Mundt committed Apr 17, 2012
1 parent 33cd5cf commit eb0cdbe
Show file tree
Hide file tree
Showing 10 changed files with 44 additions and 44 deletions.
8 changes: 4 additions & 4 deletions arch/sh/kernel/cpu/sh4a/setup-sh7343.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ static struct plat_sci_port scif0_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_CKE1,
.scbrr_algo_id = SCBRR_ALGO_2,
.type = PORT_SCIF,
.irqs = { 80, 80, 80, 80 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0xC00)),
};

static struct platform_device scif0_device = {
Expand All @@ -39,7 +39,7 @@ static struct plat_sci_port scif1_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_CKE1,
.scbrr_algo_id = SCBRR_ALGO_2,
.type = PORT_SCIF,
.irqs = { 81, 81, 81, 81 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0xC20)),
};

static struct platform_device scif1_device = {
Expand All @@ -56,7 +56,7 @@ static struct plat_sci_port scif2_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_CKE1,
.scbrr_algo_id = SCBRR_ALGO_2,
.type = PORT_SCIF,
.irqs = { 82, 82, 82, 82 },
.irq = SCIx_IRQ_MUXED(evt2irq(0xC40)),
};

static struct platform_device scif2_device = {
Expand All @@ -73,7 +73,7 @@ static struct plat_sci_port scif3_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_CKE1,
.scbrr_algo_id = SCBRR_ALGO_2,
.type = PORT_SCIF,
.irqs = { 83, 83, 83, 83 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0xC60)),
};

static struct platform_device scif3_device = {
Expand Down
2 changes: 1 addition & 1 deletion arch/sh/kernel/cpu/sh4a/setup-sh7366.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,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)),
};

static struct platform_device scif0_device = {
Expand Down
6 changes: 3 additions & 3 deletions arch/sh/kernel/cpu/sh4a/setup-sh7722.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,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,
};
Expand All @@ -201,7 +201,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,
};
Expand All @@ -220,7 +220,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,
};
Expand Down
6 changes: 3 additions & 3 deletions arch/sh/kernel/cpu/sh4a/setup-sh7723.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,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)),
.regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,
};

Expand All @@ -47,7 +47,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)),
.regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,
};

Expand All @@ -66,7 +66,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)),
.regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,
};

Expand Down
12 changes: 6 additions & 6 deletions arch/sh/kernel/cpu/sh4a/setup-sh7724.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,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)),
.regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,
};

Expand All @@ -314,7 +314,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)),
.regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,
};

Expand All @@ -333,7 +333,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)),
.regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,
};

Expand All @@ -352,7 +352,7 @@ static struct plat_sci_port scif3_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE,
.scbrr_algo_id = SCBRR_ALGO_3,
.type = PORT_SCIFA,
.irqs = { 56, 56, 56, 56 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0x900)),
};

static struct platform_device scif3_device = {
Expand All @@ -370,7 +370,7 @@ static struct plat_sci_port scif4_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE,
.scbrr_algo_id = SCBRR_ALGO_3,
.type = PORT_SCIFA,
.irqs = { 88, 88, 88, 88 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0xD00)),
};

static struct platform_device scif4_device = {
Expand All @@ -388,7 +388,7 @@ static struct plat_sci_port scif5_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE,
.scbrr_algo_id = SCBRR_ALGO_3,
.type = PORT_SCIFA,
.irqs = { 109, 109, 109, 109 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0xFA0)),
};

static struct platform_device scif5_device = {
Expand Down
6 changes: 3 additions & 3 deletions arch/sh/kernel/cpu/sh4a/setup-sh7757.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,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 = { 40, 40, 40, 40 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0x700)),
};

static struct platform_device scif2_device = {
Expand All @@ -45,7 +45,7 @@ static struct plat_sci_port scif3_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
.scbrr_algo_id = SCBRR_ALGO_2,
.type = PORT_SCIF,
.irqs = { 76, 76, 76, 76 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0xB80)),
};

static struct platform_device scif3_device = {
Expand All @@ -62,7 +62,7 @@ static struct plat_sci_port scif4_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
.scbrr_algo_id = SCBRR_ALGO_2,
.type = PORT_SCIF,
.irqs = { 104, 104, 104, 104 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0xF00)),
};

static struct platform_device scif4_device = {
Expand Down
6 changes: 3 additions & 3 deletions arch/sh/kernel/cpu/sh4a/setup-sh7763.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,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 = { 40, 40, 40, 40 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0x700)),
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
};

Expand All @@ -40,7 +40,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 = { 76, 76, 76, 76 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0xB80)),
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
};

Expand All @@ -58,7 +58,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 = { 104, 104, 104, 104 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0xF00)),
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
};

Expand Down
20 changes: 10 additions & 10 deletions arch/sh/kernel/cpu/sh4a/setup-sh7770.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ static struct plat_sci_port scif0_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE,
.scbrr_algo_id = SCBRR_ALGO_2,
.type = PORT_SCIF,
.irqs = { 61, 61, 61, 61 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0x9A0)),
};

static struct platform_device scif0_device = {
Expand All @@ -37,7 +37,7 @@ static struct plat_sci_port scif1_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE,
.scbrr_algo_id = SCBRR_ALGO_2,
.type = PORT_SCIF,
.irqs = { 62, 62, 62, 62 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0x9C0)),
};

static struct platform_device scif1_device = {
Expand All @@ -54,7 +54,7 @@ static struct plat_sci_port scif2_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE,
.scbrr_algo_id = SCBRR_ALGO_2,
.type = PORT_SCIF,
.irqs = { 63, 63, 63, 63 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0x9E0)),
};

static struct platform_device scif2_device = {
Expand All @@ -71,7 +71,7 @@ static struct plat_sci_port scif3_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE,
.scbrr_algo_id = SCBRR_ALGO_2,
.type = PORT_SCIF,
.irqs = { 64, 64, 64, 64 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0xA00)),
};

static struct platform_device scif3_device = {
Expand All @@ -88,7 +88,7 @@ static struct plat_sci_port scif4_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE,
.scbrr_algo_id = SCBRR_ALGO_2,
.type = PORT_SCIF,
.irqs = { 65, 65, 65, 65 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0xA20)),
};

static struct platform_device scif4_device = {
Expand All @@ -105,7 +105,7 @@ static struct plat_sci_port scif5_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE,
.scbrr_algo_id = SCBRR_ALGO_2,
.type = PORT_SCIF,
.irqs = { 66, 66, 66, 66 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0xA40)),
};

static struct platform_device scif5_device = {
Expand All @@ -122,7 +122,7 @@ static struct plat_sci_port scif6_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE,
.scbrr_algo_id = SCBRR_ALGO_2,
.type = PORT_SCIF,
.irqs = { 67, 67, 67, 67 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0xA60)),
};

static struct platform_device scif6_device = {
Expand All @@ -139,7 +139,7 @@ static struct plat_sci_port scif7_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE,
.scbrr_algo_id = SCBRR_ALGO_2,
.type = PORT_SCIF,
.irqs = { 68, 68, 68, 68 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0xA80)),
};

static struct platform_device scif7_device = {
Expand All @@ -156,7 +156,7 @@ static struct plat_sci_port scif8_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE,
.scbrr_algo_id = SCBRR_ALGO_2,
.type = PORT_SCIF,
.irqs = { 69, 69, 69, 69 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0xAA0)),
};

static struct platform_device scif8_device = {
Expand All @@ -173,7 +173,7 @@ static struct plat_sci_port scif9_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE,
.scbrr_algo_id = SCBRR_ALGO_2,
.type = PORT_SCIF,
.irqs = { 70, 70, 70, 70 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0xAC0)),
};

static struct platform_device scif9_device = {
Expand Down
12 changes: 6 additions & 6 deletions arch/sh/kernel/cpu/sh4a/setup-sh7785.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ static struct plat_sci_port scif0_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,
.scbrr_algo_id = SCBRR_ALGO_1,
.type = PORT_SCIF,
.irqs = { 40, 40, 40, 40 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0x700)),
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
};

Expand All @@ -42,7 +42,7 @@ static struct plat_sci_port scif1_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,
.scbrr_algo_id = SCBRR_ALGO_1,
.type = PORT_SCIF,
.irqs = { 44, 44, 44, 44 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0x780)),
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
};

Expand All @@ -60,7 +60,7 @@ static struct plat_sci_port scif2_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,
.scbrr_algo_id = SCBRR_ALGO_1,
.type = PORT_SCIF,
.irqs = { 60, 60, 60, 60 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0x980)),
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
};

Expand All @@ -78,7 +78,7 @@ static struct plat_sci_port scif3_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,
.scbrr_algo_id = SCBRR_ALGO_1,
.type = PORT_SCIF,
.irqs = { 61, 61, 61, 61 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0x9A0)),
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
};

Expand All @@ -96,7 +96,7 @@ static struct plat_sci_port scif4_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,
.scbrr_algo_id = SCBRR_ALGO_1,
.type = PORT_SCIF,
.irqs = { 62, 62, 62, 62 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0x9C0)),
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
};

Expand All @@ -114,7 +114,7 @@ static struct plat_sci_port scif5_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,
.scbrr_algo_id = SCBRR_ALGO_1,
.type = PORT_SCIF,
.irqs = { 63, 63, 63, 63 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0x9E0)),
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
};

Expand Down
10 changes: 5 additions & 5 deletions arch/sh/kernel/cpu/sh4a/setup-sh7786.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ static struct plat_sci_port scif1_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,
.scbrr_algo_id = SCBRR_ALGO_1,
.type = PORT_SCIF,
.irqs = { 44, 44, 44, 44 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0x780)),
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
};

Expand All @@ -71,7 +71,7 @@ static struct plat_sci_port scif2_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,
.scbrr_algo_id = SCBRR_ALGO_1,
.type = PORT_SCIF,
.irqs = { 50, 50, 50, 50 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0x840)),
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
};

Expand All @@ -89,7 +89,7 @@ static struct plat_sci_port scif3_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,
.scbrr_algo_id = SCBRR_ALGO_1,
.type = PORT_SCIF,
.irqs = { 51, 51, 51, 51 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0x860)),
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
};

Expand All @@ -107,7 +107,7 @@ static struct plat_sci_port scif4_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,
.scbrr_algo_id = SCBRR_ALGO_1,
.type = PORT_SCIF,
.irqs = { 52, 52, 52, 52 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0x880)),
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
};

Expand All @@ -125,7 +125,7 @@ static struct plat_sci_port scif5_platform_data = {
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1,
.scbrr_algo_id = SCBRR_ALGO_1,
.type = PORT_SCIF,
.irqs = { 53, 53, 53, 53 },
.irqs = SCIx_IRQ_MUXED(evt2irq(0x8A0)),
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
};

Expand Down

0 comments on commit eb0cdbe

Please sign in to comment.