projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.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...
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
arch
/
sh
/
kernel
/
cpu
/
sh3
/
setup-sh7710.c
diff --git
a/arch/sh/kernel/cpu/sh3/setup-sh7710.c
b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
index b0c2fb4ab47918fde4ff802a3fd315a9441e0e82..78f6b01d42c3c8cf0def51c3d341f05c4fc9cb49 100644
(file)
--- a/
arch/sh/kernel/cpu/sh3/setup-sh7710.c
+++ b/
arch/sh/kernel/cpu/sh3/setup-sh7710.c
@@
-99,6
+99,9
@@
static struct platform_device rtc_device = {
static struct plat_sci_port scif0_platform_data = {
.mapbase = 0xa4400000,
.flags = UPF_BOOT_AUTOCONF,
static struct plat_sci_port scif0_platform_data = {
.mapbase = 0xa4400000,
.flags = UPF_BOOT_AUTOCONF,
+ .scscr = SCSCR_TE | SCSCR_RE | SCSCR_REIE |
+ SCSCR_CKE1 | SCSCR_CKE0,
+ .scbrr_algo_id = SCBRR_ALGO_2,
.type = PORT_SCIF,
.irqs = { 52, 52, 52, 52 },
};
.type = PORT_SCIF,
.irqs = { 52, 52, 52, 52 },
};
@@
-114,6
+117,9
@@
static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = {
.mapbase = 0xa4410000,
.flags = UPF_BOOT_AUTOCONF,
static struct plat_sci_port scif1_platform_data = {
.mapbase = 0xa4410000,
.flags = UPF_BOOT_AUTOCONF,
+ .scscr = SCSCR_TE | SCSCR_RE | SCSCR_REIE |
+ SCSCR_CKE1 | SCSCR_CKE0,
+ .scbrr_algo_id = SCBRR_ALGO_2,
.type = PORT_SCIF,
.irqs = { 56, 56, 56, 56 },
};
.type = PORT_SCIF,
.irqs = { 56, 56, 56, 56 },
};