projects
/
firefly-linux-kernel-4.4.55.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...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
sh
/
kernel
/
cpu
/
sh4a
/
setup-sh7343.c
diff --git
a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
index 3681cafdb4aff06a4be1fdcd4a438ea834d7ccb4..0d1be5d1fb86976612474f860e044f4efc78dd84 100644
(file)
--- a/
arch/sh/kernel/cpu/sh4a/setup-sh7343.c
+++ b/
arch/sh/kernel/cpu/sh4a/setup-sh7343.c
@@
-19,6
+19,8
@@
static struct plat_sci_port scif0_platform_data = {
.mapbase = 0xffe00000,
.flags = UPF_BOOT_AUTOCONF,
static struct plat_sci_port scif0_platform_data = {
.mapbase = 0xffe00000,
.flags = UPF_BOOT_AUTOCONF,
+ .scscr = SCSCR_RE | SCSCR_TE | SCSCR_CKE1,
+ .scbrr_algo_id = SCBRR_ALGO_2,
.type = PORT_SCIF,
.irqs = { 80, 80, 80, 80 },
};
.type = PORT_SCIF,
.irqs = { 80, 80, 80, 80 },
};
@@
-34,6
+36,8
@@
static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = {
.mapbase = 0xffe10000,
.flags = UPF_BOOT_AUTOCONF,
static struct plat_sci_port scif1_platform_data = {
.mapbase = 0xffe10000,
.flags = UPF_BOOT_AUTOCONF,
+ .scscr = SCSCR_RE | SCSCR_TE | SCSCR_CKE1,
+ .scbrr_algo_id = SCBRR_ALGO_2,
.type = PORT_SCIF,
.irqs = { 81, 81, 81, 81 },
};
.type = PORT_SCIF,
.irqs = { 81, 81, 81, 81 },
};
@@
-49,6
+53,8
@@
static struct platform_device scif1_device = {
static struct plat_sci_port scif2_platform_data = {
.mapbase = 0xffe20000,
.flags = UPF_BOOT_AUTOCONF,
static struct plat_sci_port scif2_platform_data = {
.mapbase = 0xffe20000,
.flags = UPF_BOOT_AUTOCONF,
+ .scscr = SCSCR_RE | SCSCR_TE | SCSCR_CKE1,
+ .scbrr_algo_id = SCBRR_ALGO_2,
.type = PORT_SCIF,
.irqs = { 82, 82, 82, 82 },
};
.type = PORT_SCIF,
.irqs = { 82, 82, 82, 82 },
};
@@
-64,6
+70,8
@@
static struct platform_device scif2_device = {
static struct plat_sci_port scif3_platform_data = {
.mapbase = 0xffe30000,
.flags = UPF_BOOT_AUTOCONF,
static struct plat_sci_port scif3_platform_data = {
.mapbase = 0xffe30000,
.flags = UPF_BOOT_AUTOCONF,
+ .scscr = SCSCR_RE | SCSCR_TE | SCSCR_CKE1,
+ .scbrr_algo_id = SCBRR_ALGO_2,
.type = PORT_SCIF,
.irqs = { 83, 83, 83, 83 },
};
.type = PORT_SCIF,
.irqs = { 83, 83, 83, 83 },
};