diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-01-13 15:21:27 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-13 15:21:27 +0900 |
commit | ef7fc9026fe6adef13870c6b2cb4642b6193af67 (patch) | |
tree | 6f41f996de6e76161fdfc60a197ec42f0aa0ec7d /arch/sh/kernel/cpu/sh5/setup-sh5.c | |
parent | fac6c2a891a3e7255e4440f09a4c7da954043ba9 (diff) | |
parent | f43dc23d5ea91fca257be02138a255f02d98e806 (diff) | |
download | linux-stable-ef7fc9026fe6adef13870c6b2cb4642b6193af67.tar.gz linux-stable-ef7fc9026fe6adef13870c6b2cb4642b6193af67.tar.bz2 linux-stable-ef7fc9026fe6adef13870c6b2cb4642b6193af67.zip |
Merge branch 'common/serial-rework' into sh-latest
Diffstat (limited to 'arch/sh/kernel/cpu/sh5/setup-sh5.c')
-rw-r--r-- | arch/sh/kernel/cpu/sh5/setup-sh5.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/kernel/cpu/sh5/setup-sh5.c b/arch/sh/kernel/cpu/sh5/setup-sh5.c index d910666142b1..18419f1de963 100644 --- a/arch/sh/kernel/cpu/sh5/setup-sh5.c +++ b/arch/sh/kernel/cpu/sh5/setup-sh5.c @@ -19,6 +19,8 @@ static struct plat_sci_port scif0_platform_data = { .mapbase = PHYS_PERIPHERAL_BLOCK + 0x01030000, .flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP, + .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, + .scbrr_algo_id = SCBRR_ALGO_2, .type = PORT_SCIF, .irqs = { 39, 40, 42, 0 }, }; |