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

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

sh: sh4a: 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 SH4A series.

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

arch/sh/kernel/cpu/sh4a/setup-sh7343.c

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

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_CKE1,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type           = PORT_SCIF,

	.type           = PORT_SCIF,

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

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

};

};





static struct platform_device scif0_device = {

static struct platform_device scif0_device = {
@@ -39,7 +39,7 @@ static struct plat_sci_port scif1_platform_data = { 
	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_CKE1,

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_CKE1,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type           = PORT_SCIF,

	.type           = PORT_SCIF,

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

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

};

};





static struct platform_device scif1_device = {

static struct platform_device scif1_device = {
@@ -56,7 +56,7 @@ static struct plat_sci_port scif2_platform_data = { 
	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_CKE1,

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_CKE1,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type           = PORT_SCIF,

	.type           = PORT_SCIF,

	.irqs           = { 82, 82, 82, 82 },

	.irq            = SCIx_IRQ_MUXED(evt2irq(0xC40)),

};

};





static struct platform_device scif2_device = {

static struct platform_device scif2_device = {
@@ -73,7 +73,7 @@ static struct plat_sci_port scif3_platform_data = { 
	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_CKE1,

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_CKE1,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type           = PORT_SCIF,

	.type           = PORT_SCIF,

	.irqs           = { 83, 83, 83, 83 },

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

};

};





static struct platform_device scif3_device = {

static struct platform_device scif3_device = {

arch/sh/kernel/cpu/sh4a/setup-sh7366.c

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

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

	.type		= PORT_SCIF,

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

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

};

};





static struct platform_device scif0_device = {

static struct platform_device scif0_device = {

arch/sh/kernel/cpu/sh4a/setup-sh7722.c

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

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type           = PORT_SCIF,

	.type           = PORT_SCIF,

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

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

	.ops		= &sh7722_sci_port_ops,

	.ops		= &sh7722_sci_port_ops,

	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,

	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,

};

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

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type           = PORT_SCIF,

	.type           = PORT_SCIF,

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

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

	.ops		= &sh7722_sci_port_ops,

	.ops		= &sh7722_sci_port_ops,

	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,

	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,

};

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

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type           = PORT_SCIF,

	.type           = PORT_SCIF,

	.irqs           = { 82, 82, 82, 82 },

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

	.ops		= &sh7722_sci_port_ops,

	.ops		= &sh7722_sci_port_ops,

	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,

	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,

};

};

arch/sh/kernel/cpu/sh4a/setup-sh7723.c

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

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type           = PORT_SCIF,

	.type           = PORT_SCIF,

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

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

	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,

	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,

};

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

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type           = PORT_SCIF,

	.type           = PORT_SCIF,

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

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

	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,

	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,

};

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

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type           = PORT_SCIF,

	.type           = PORT_SCIF,

	.irqs           = { 82, 82, 82, 82 },

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

	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,

	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,

};

};

arch/sh/kernel/cpu/sh4a/setup-sh7724.c

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

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type           = PORT_SCIF,

	.type           = PORT_SCIF,

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

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

	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,

	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,

};

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

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type           = PORT_SCIF,

	.type           = PORT_SCIF,

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

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

	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,

	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,

};

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

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type           = PORT_SCIF,

	.type           = PORT_SCIF,

	.irqs           = { 82, 82, 82, 82 },

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

	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,

	.regtype	= SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,

};

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

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_3,

	.scbrr_algo_id	= SCBRR_ALGO_3,

	.type           = PORT_SCIFA,

	.type           = PORT_SCIFA,

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

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

};

};





static struct platform_device scif3_device = {

static struct platform_device scif3_device = {
@@ -370,7 +370,7 @@ static struct plat_sci_port scif4_platform_data = { 
	.scscr		= SCSCR_RE | SCSCR_TE,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_3,

	.scbrr_algo_id	= SCBRR_ALGO_3,

	.type           = PORT_SCIFA,

	.type           = PORT_SCIFA,

	.irqs           = { 88, 88, 88, 88 },

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

};

};





static struct platform_device scif4_device = {

static struct platform_device scif4_device = {
@@ -388,7 +388,7 @@ static struct plat_sci_port scif5_platform_data = { 
	.scscr		= SCSCR_RE | SCSCR_TE,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_3,

	.scbrr_algo_id	= SCBRR_ALGO_3,

	.type           = PORT_SCIFA,

	.type           = PORT_SCIFA,

	.irqs           = { 109, 109, 109, 109 },

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

};

};





static struct platform_device scif5_device = {

static struct platform_device scif5_device = {