diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-01-13 01:21:27 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-13 01:21:27 -0500 |
commit | ef7fc9026fe6adef13870c6b2cb4642b6193af67 (patch) | |
tree | 6f41f996de6e76161fdfc60a197ec42f0aa0ec7d /arch/sh/kernel/cpu/sh2/setup-sh7619.c | |
parent | fac6c2a891a3e7255e4440f09a4c7da954043ba9 (diff) | |
parent | f43dc23d5ea91fca257be02138a255f02d98e806 (diff) |
Merge branch 'common/serial-rework' into sh-latest
Diffstat (limited to 'arch/sh/kernel/cpu/sh2/setup-sh7619.c')
-rw-r--r-- | arch/sh/kernel/cpu/sh2/setup-sh7619.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/sh/kernel/cpu/sh2/setup-sh7619.c b/arch/sh/kernel/cpu/sh2/setup-sh7619.c index c3638516bffc..0f8befccf9fa 100644 --- a/arch/sh/kernel/cpu/sh2/setup-sh7619.c +++ b/arch/sh/kernel/cpu/sh2/setup-sh7619.c | |||
@@ -62,6 +62,8 @@ static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | |||
62 | static struct plat_sci_port scif0_platform_data = { | 62 | static struct plat_sci_port scif0_platform_data = { |
63 | .mapbase = 0xf8400000, | 63 | .mapbase = 0xf8400000, |
64 | .flags = UPF_BOOT_AUTOCONF, | 64 | .flags = UPF_BOOT_AUTOCONF, |
65 | .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, | ||
66 | .scbrr_algo_id = SCBRR_ALGO_2, | ||
65 | .type = PORT_SCIF, | 67 | .type = PORT_SCIF, |
66 | .irqs = { 88, 88, 88, 88 }, | 68 | .irqs = { 88, 88, 88, 88 }, |
67 | }; | 69 | }; |
@@ -77,6 +79,8 @@ static struct platform_device scif0_device = { | |||
77 | static struct plat_sci_port scif1_platform_data = { | 79 | static struct plat_sci_port scif1_platform_data = { |
78 | .mapbase = 0xf8410000, | 80 | .mapbase = 0xf8410000, |
79 | .flags = UPF_BOOT_AUTOCONF, | 81 | .flags = UPF_BOOT_AUTOCONF, |
82 | .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, | ||
83 | .scbrr_algo_id = SCBRR_ALGO_2, | ||
80 | .type = PORT_SCIF, | 84 | .type = PORT_SCIF, |
81 | .irqs = { 92, 92, 92, 92 }, | 85 | .irqs = { 92, 92, 92, 92 }, |
82 | }; | 86 | }; |
@@ -92,6 +96,8 @@ static struct platform_device scif1_device = { | |||
92 | static struct plat_sci_port scif2_platform_data = { | 96 | static struct plat_sci_port scif2_platform_data = { |
93 | .mapbase = 0xf8420000, | 97 | .mapbase = 0xf8420000, |
94 | .flags = UPF_BOOT_AUTOCONF, | 98 | .flags = UPF_BOOT_AUTOCONF, |
99 | .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, | ||
100 | .scbrr_algo_id = SCBRR_ALGO_2, | ||
95 | .type = PORT_SCIF, | 101 | .type = PORT_SCIF, |
96 | .irqs = { 96, 96, 96, 96 }, | 102 | .irqs = { 96, 96, 96, 96 }, |
97 | }; | 103 | }; |