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

Commit 26c92f37 authored by Paul Mundt's avatar Paul Mundt
Browse files

serial: sh-sci: Move SCBRR calculation algo in to platform data. 



This permits each port to select its own SCBRR calculation algorithm,
rather than having it all ifdef'ed in the header. There are presently
only 5 different variations that all parts fall under.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 00b9de9c

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

+3 −0
Original line number Diff line number Diff line
@@ -64,18 +64,21 @@ static struct plat_sci_port sci_platform_data[] = { 
		.mapbase	= 0xf8400000,

		.flags		= UPF_BOOT_AUTOCONF,

		.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

		.scbrr_algo_id	= SCBRR_ALGO_2,

		.type		= PORT_SCIF,

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

	}, {

		.mapbase	= 0xf8410000,

		.flags		= UPF_BOOT_AUTOCONF,

		.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

		.scbrr_algo_id	= SCBRR_ALGO_2,

		.type		= PORT_SCIF,

		.irqs		= { 92, 92, 92, 92 },

	}, {

		.mapbase	= 0xf8420000,

		.flags		= UPF_BOOT_AUTOCONF,

		.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

		.scbrr_algo_id	= SCBRR_ALGO_2,

		.type		= PORT_SCIF,

		.irqs		= { 96, 96, 96, 96 },

	}, {

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

+1 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ static struct plat_sci_port sci_platform_data[] = { 
		.mapbase	= 0xff804000,

		.flags		= UPF_BOOT_AUTOCONF,

		.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

		.scbrr_algo_id	= SCBRR_ALGO_2,

		.type		= PORT_SCIF,

		.irqs		= { 220, 220, 220, 220 },

	}, {

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

+8 −0
Original line number Diff line number Diff line
@@ -182,48 +182,56 @@ static struct plat_sci_port sci_platform_data[] = { 
		.mapbase	= 0xfffe8000,

		.flags		= UPF_BOOT_AUTOCONF,

		.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

		.scbrr_algo_id	= SCBRR_ALGO_2,

		.type		= PORT_SCIF,

		.irqs		= { 180, 180, 180, 180 }

	}, {

		.mapbase	= 0xfffe8800,

		.flags		= UPF_BOOT_AUTOCONF,

		.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

		.scbrr_algo_id	= SCBRR_ALGO_2,

		.type		= PORT_SCIF,

		.irqs		= { 184, 184, 184, 184 }

	}, {

		.mapbase	= 0xfffe9000,

		.flags		= UPF_BOOT_AUTOCONF,

		.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

		.scbrr_algo_id	= SCBRR_ALGO_2,

		.type		= PORT_SCIF,

		.irqs		= { 188, 188, 188, 188 }

	}, {

		.mapbase	= 0xfffe9800,

		.flags		= UPF_BOOT_AUTOCONF,

		.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

		.scbrr_algo_id	= SCBRR_ALGO_2,

		.type		= PORT_SCIF,

		.irqs		= { 192, 192, 192, 192 }

	}, {

		.mapbase	= 0xfffea000,

		.flags		= UPF_BOOT_AUTOCONF,

		.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

		.scbrr_algo_id	= SCBRR_ALGO_2,

		.type		= PORT_SCIF,

		.irqs		= { 196, 196, 196, 196 }

	}, {

		.mapbase	= 0xfffea800,

		.flags		= UPF_BOOT_AUTOCONF,

		.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

		.scbrr_algo_id	= SCBRR_ALGO_2,

		.type		= PORT_SCIF,

		.irqs		= { 200, 200, 200, 200 }

	}, {

		.mapbase	= 0xfffeb000,

		.flags		= UPF_BOOT_AUTOCONF,

		.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

		.scbrr_algo_id	= SCBRR_ALGO_2,

		.type		= PORT_SCIF,

		.irqs		= { 204, 204, 204, 204 }

	}, {

		.mapbase	= 0xfffeb800,

		.flags		= UPF_BOOT_AUTOCONF,

		.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

		.scbrr_algo_id	= SCBRR_ALGO_2,

		.type		= PORT_SCIF,

		.irqs		= { 208, 208, 208, 208 }

	}, {

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

+4 −0
Original line number Diff line number Diff line
@@ -178,24 +178,28 @@ static struct plat_sci_port sci_platform_data[] = { 
		.mapbase	= 0xfffe8000,

		.flags		= UPF_BOOT_AUTOCONF,

		.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

		.scbrr_algo_id	= SCBRR_ALGO_2,

		.type		= PORT_SCIF,

		.irqs		=  { 192, 192, 192, 192 },

	}, {

		.mapbase	= 0xfffe8800,

		.flags		= UPF_BOOT_AUTOCONF,

		.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

		.scbrr_algo_id	= SCBRR_ALGO_2,

		.type		= PORT_SCIF,

		.irqs		=  { 196, 196, 196, 196 },

	}, {

		.mapbase	= 0xfffe9000,

		.flags		= UPF_BOOT_AUTOCONF,

		.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

		.scbrr_algo_id	= SCBRR_ALGO_2,

		.type		= PORT_SCIF,

		.irqs		=  { 200, 200, 200, 200 },

	}, {

		.mapbase	= 0xfffe9800,

		.flags		= UPF_BOOT_AUTOCONF,

		.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

		.scbrr_algo_id	= SCBRR_ALGO_2,

		.type		= PORT_SCIF,

		.irqs		=  { 204, 204, 204, 204 },

	}, {

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

+4 −0
Original line number Diff line number Diff line
@@ -138,24 +138,28 @@ static struct plat_sci_port sci_platform_data[] = { 
		.mapbase	= 0xfffe8000,

		.flags		= UPF_BOOT_AUTOCONF,

		.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

		.scbrr_algo_id	= SCBRR_ALGO_2,

		.type		= PORT_SCIF,

		.irqs		= { 240, 240, 240, 240 },

	}, {

		.mapbase	= 0xfffe8800,

		.flags		= UPF_BOOT_AUTOCONF,

		.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

		.scbrr_algo_id	= SCBRR_ALGO_2,

		.type		= PORT_SCIF,

		.irqs		= { 244, 244, 244, 244 },

	}, {

		.mapbase	= 0xfffe9000,

		.flags		= UPF_BOOT_AUTOCONF,

		.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

		.scbrr_algo_id	= SCBRR_ALGO_2,

		.type		= PORT_SCIF,

		.irqs		= { 248, 248, 248, 248 },

	}, {

		.mapbase	= 0xfffe9800,

		.flags		= UPF_BOOT_AUTOCONF,

		.scscr		= SCSCR_RE | SCSCR_TE | SCSCR_REIE,

		.scbrr_algo_id	= SCBRR_ALGO_2,

		.type		= PORT_SCIF,

		.irqs		= { 252, 252, 252, 252 },

	}, {