git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux...
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
cpu
/
sh3
/
setup-sh7720.c
diff --git
a/arch/sh/kernel/cpu/sh3/setup-sh7720.c
b/arch/sh/kernel/cpu/sh3/setup-sh7720.c
index
24b1713
..
365b94a
100644
(file)
--- a/
arch/sh/kernel/cpu/sh3/setup-sh7720.c
+++ b/
arch/sh/kernel/cpu/sh3/setup-sh7720.c
@@
-1,5
+1,5
@@
/*
/*
- * S
H7720 Setup
+ * S
etup code for SH7720, SH7721.
*
* Copyright (C) 2007 Markus Brunner, Mark Jonas
* Copyright (C) 2009 Paul Mundt
*
* Copyright (C) 2007 Markus Brunner, Mark Jonas
* Copyright (C) 2009 Paul Mundt
@@
-51,6
+51,8
@@
static struct platform_device rtc_device = {
static struct plat_sci_port scif0_platform_data = {
.mapbase = 0xa4430000,
.flags = UPF_BOOT_AUTOCONF,
static struct plat_sci_port scif0_platform_data = {
.mapbase = 0xa4430000,
.flags = UPF_BOOT_AUTOCONF,
+ .scscr = SCSCR_RE | SCSCR_TE,
+ .scbrr_algo_id = SCBRR_ALGO_4,
.type = PORT_SCIF,
.irqs = { 80, 80, 80, 80 },
};
.type = PORT_SCIF,
.irqs = { 80, 80, 80, 80 },
};
@@
-66,6
+68,8
@@
static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = {
.mapbase = 0xa4438000,
.flags = UPF_BOOT_AUTOCONF,
static struct plat_sci_port scif1_platform_data = {
.mapbase = 0xa4438000,
.flags = UPF_BOOT_AUTOCONF,
+ .scscr = SCSCR_RE | SCSCR_TE,
+ .scbrr_algo_id = SCBRR_ALGO_4,
.type = PORT_SCIF,
.irqs = { 81, 81, 81, 81 },
};
.type = PORT_SCIF,
.irqs = { 81, 81, 81, 81 },
};