Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 545f3bcf authored by Nobuhiro Iwamatsu's avatar Nobuhiro Iwamatsu Committed by Paul Mundt
Browse files

sh: sh3: Change the specification method of IRQ to SCIx_IRQ_MUXED 



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 SH3 series.

Signed-off-by: default avatarNobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 51edfb33

arch/sh/kernel/cpu/sh3/setup-sh7705.c

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static struct plat_sci_port scif0_platform_data = { 
			  SCSCR_RE  | SCSCR_CKE1 | SCSCR_CKE0,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.irqs		= { 56, 56, 56 },

	.irqs		= SCIx_IRQ_MUXED(evt2irq(0x900)),

	.ops		= &sh770x_sci_port_ops,

	.regtype	= SCIx_SH7705_SCIF_REGTYPE,

};
@@ -94,7 +94,7 @@ static struct plat_sci_port scif1_platform_data = { 
	.scscr		= SCSCR_TIE | SCSCR_RIE | SCSCR_TE | SCSCR_RE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.irqs		= { 52, 52, 52 },

	.irqs		= SCIx_IRQ_MUXED(evt2irq(0x880)),

	.ops		= &sh770x_sci_port_ops,

	.regtype	= SCIx_SH7705_SCIF_REGTYPE,

};

arch/sh/kernel/cpu/sh3/setup-sh770x.c

+3 −3
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static struct plat_sci_port scif0_platform_data = { 
	.scscr		= SCSCR_TE | SCSCR_RE,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCI,

	.irqs		= { 23, 23, 23, 0 },

	.irqs		= SCIx_IRQ_MUXED(evt2irq(0x4E0)),

	.ops		= &sh770x_sci_port_ops,

	.regshift	= 1,

};
@@ -135,7 +135,7 @@ static struct plat_sci_port scif1_platform_data = { 
	.scscr		= SCSCR_TE | SCSCR_RE,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

	.irqs		= { 56, 56, 56, 56 },

	.irqs		= SCIx_IRQ_MUXED(evt2irq(0x900)),

	.ops		= &sh770x_sci_port_ops,

	.regtype	= SCIx_SH3_SCIF_REGTYPE,

};
@@ -157,7 +157,7 @@ static struct plat_sci_port scif2_platform_data = { 
	.scscr		= SCSCR_TE | SCSCR_RE,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_IRDA,

	.irqs		= { 52, 52, 52, 52 },

	.irqs		= SCIx_IRQ_MUXED(evt2irq(0x880)),

	.ops		= &sh770x_sci_port_ops,

	.regshift	= 1,

};

arch/sh/kernel/cpu/sh3/setup-sh7710.c

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static struct plat_sci_port scif0_platform_data = { 
			  SCSCR_CKE1 | SCSCR_CKE0,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

	.irqs		= { 52, 52, 52, 52 },

	.irqs		= SCIx_IRQ_MUXED(evt2irq(0x880)),

};



static struct platform_device scif0_device = {
@@ -121,7 +121,7 @@ static struct plat_sci_port scif1_platform_data = { 
			  SCSCR_CKE1 | SCSCR_CKE0,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

	.irqs           = { 56, 56, 56, 56 },

	.irqs		= SCIx_IRQ_MUXED(evt2irq(0x900)),

};



static struct platform_device scif1_device = {

arch/sh/kernel/cpu/sh3/setup-sh7720.c

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static struct plat_sci_port scif0_platform_data = { 
	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.irqs		= { 80, 80, 80, 80 },

	.irqs		= SCIx_IRQ_MUXED(evt2irq(0xC00)),

	.ops		= &sh7720_sci_port_ops,

	.regtype	= SCIx_SH7705_SCIF_REGTYPE,

};
@@ -74,7 +74,7 @@ static struct plat_sci_port scif1_platform_data = { 
	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.irqs           = { 81, 81, 81, 81 },

	.irqs		= SCIx_IRQ_MUXED(evt2irq(0xC20)),

	.ops		= &sh7720_sci_port_ops,

	.regtype	= SCIx_SH7705_SCIF_REGTYPE,

};