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

Commit d5917ef3 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Simon Horman
Browse files

sh: Don't set plat_sci_port scbrr_algo_id field 



The field will be removed from the sh-sci driver. Don't set it and let
the driver handle baud rate calculation internally.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 64c535e9

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

+0 −3
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ 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,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

};
@@ -85,7 +84,6 @@ 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,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

};
@@ -107,7 +105,6 @@ 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,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

};

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

+0 −1
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ static struct platform_device mtu2_2_device = { 
static struct plat_sci_port scif0_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

};

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

+0 −8
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ 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,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

};
@@ -202,7 +201,6 @@ 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,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

};
@@ -224,7 +222,6 @@ 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,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

};
@@ -246,7 +243,6 @@ 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,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

};
@@ -268,7 +264,6 @@ 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,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

};
@@ -290,7 +285,6 @@ 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,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

};
@@ -312,7 +306,6 @@ 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,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

};
@@ -334,7 +327,6 @@ 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,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

};

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

+0 −4
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ static struct plat_sci_port scif0_platform_data = { 
	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |

			  SCSCR_REIE,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,

};
@@ -201,7 +200,6 @@ static struct plat_sci_port scif1_platform_data = { 
	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |

			  SCSCR_REIE,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,

};
@@ -225,7 +223,6 @@ static struct plat_sci_port scif2_platform_data = { 
	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |

			  SCSCR_REIE,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,

};
@@ -249,7 +246,6 @@ static struct plat_sci_port scif3_platform_data = { 
	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |

			  SCSCR_REIE,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,

};

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

+0 −4
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ 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,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

};
@@ -158,7 +157,6 @@ 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,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

};
@@ -180,7 +178,6 @@ 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,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

};
@@ -202,7 +199,6 @@ 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,

	.scbrr_algo_id	= SCBRR_ALGO_2,

	.type		= PORT_SCIF,

};