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: Paul Mundt <lethal@linux-sh.org>

4 files changed, 17 insertions, 0 deletions

diff --git a/arch/sh/kernel/cpu/sh2a/setup-mxg.c b/arch/sh/kernel/cpu/sh2a/setup-mxg.c
index 7ec658ce14f8..b2c3bcc01190 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-mxg.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-mxg.c
@@ -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 },
         }, {
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7201.c b/arch/sh/kernel/cpu/sh2a/setup-sh7201.c
index 2a2ac222f9c7..8d44917ce50b 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7201.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7201.c
@@ -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 }
         }, {
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
index 2c9f3ababfd7..a78d2a219f3b 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
@@ -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 },
         }, {
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
index 5a47987f3902..68b93ed44cc2 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
@@ -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 },
         }, {