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

Commit c3fa400b authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Greg Kroah-Hartman
Browse files

sh: Don't set sh-sci pdata scscr TE and RE bits 



The bits are set by the driver internally, don't set them in platform
data.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3d73f32b

arch/sh/kernel/cpu/sh2/setup-sh7619.c

+3 −3
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, 


static struct plat_sci_port scif0_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};
@@ -83,7 +83,7 @@ static struct platform_device scif0_device = { 


static struct plat_sci_port scif1_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};
@@ -104,7 +104,7 @@ static struct platform_device scif1_device = { 


static struct plat_sci_port scif2_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};

arch/sh/kernel/cpu/sh2a/setup-mxg.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static struct platform_device mtu2_device = { 


static struct plat_sci_port scif0_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};

arch/sh/kernel/cpu/sh2a/setup-sh7201.c

+8 −8
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7201", vectors, groups, 


static struct plat_sci_port scif0_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};
@@ -200,7 +200,7 @@ static struct platform_device scif0_device = { 


static struct plat_sci_port scif1_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};
@@ -221,7 +221,7 @@ static struct platform_device scif1_device = { 


static struct plat_sci_port scif2_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};
@@ -242,7 +242,7 @@ static struct platform_device scif2_device = { 


static struct plat_sci_port scif3_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};
@@ -263,7 +263,7 @@ static struct platform_device scif3_device = { 


static struct plat_sci_port scif4_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};
@@ -284,7 +284,7 @@ static struct platform_device scif4_device = { 


static struct plat_sci_port scif5_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};
@@ -305,7 +305,7 @@ static struct platform_device scif5_device = { 


static struct plat_sci_port scif6_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};
@@ -326,7 +326,7 @@ static struct platform_device scif6_device = { 


static struct plat_sci_port scif7_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};

arch/sh/kernel/cpu/sh2a/setup-sh7203.c

+4 −8
Original line number Diff line number Diff line
@@ -175,8 +175,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7203", vectors, groups, 


static struct plat_sci_port scif0_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |

			  SCSCR_REIE,

	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_REIE,

	.type		= PORT_SCIF,

	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,

};
@@ -198,8 +197,7 @@ static struct platform_device scif0_device = { 


static struct plat_sci_port scif1_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |

			  SCSCR_REIE,

	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_REIE,

	.type		= PORT_SCIF,

	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,

};
@@ -221,8 +219,7 @@ static struct platform_device scif1_device = { 


static struct plat_sci_port scif2_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |

			  SCSCR_REIE,

	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_REIE,

	.type		= PORT_SCIF,

	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,

};
@@ -244,8 +241,7 @@ static struct platform_device scif2_device = { 


static struct plat_sci_port scif3_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |

			  SCSCR_REIE,

	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_REIE,

	.type		= PORT_SCIF,

	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,

};

arch/sh/kernel/cpu/sh2a/setup-sh7206.c

+4 −4
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7206", vectors, groups, 


static struct plat_sci_port scif0_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};
@@ -156,7 +156,7 @@ static struct platform_device scif0_device = { 


static struct plat_sci_port scif1_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};
@@ -177,7 +177,7 @@ static struct platform_device scif1_device = { 


static struct plat_sci_port scif2_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};
@@ -198,7 +198,7 @@ static struct platform_device scif2_device = { 


static struct plat_sci_port scif3_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};