Skip to content

L
linux
Commit c3fa400b authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Greg Kroah-Hartman
Browse files
Options

sh: Don't set sh-sci pdata scscr TE and RE bits 

The bits are set by the driver internally, don't set them in platform
data.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3d73f32b
Show whitespace changes
Inline Side-by-side
Showing with 103 additions and 135 deletions
arch/sh/kernel/cpu/sh2/setup-sh7619.c
View file @ c3fa400b
...@@ -62,7 +62,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, ...@@ -62,7 +62,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL,
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -83,7 +83,7 @@ static struct platform_device scif0_device = { ...@@ -83,7 +83,7 @@ static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = { static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -104,7 +104,7 @@ static struct platform_device scif1_device = { ...@@ -104,7 +104,7 @@ static struct platform_device scif1_device = {
static struct plat_sci_port scif2_platform_data = { static struct plat_sci_port scif2_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
......
arch/sh/kernel/cpu/sh2a/setup-mxg.c
View file @ c3fa400b
...@@ -130,7 +130,7 @@ static struct platform_device mtu2_device = { ...@@ -130,7 +130,7 @@ static struct platform_device mtu2_device = {
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
......
arch/sh/kernel/cpu/sh2a/setup-sh7201.c
View file @ c3fa400b
...@@ -179,7 +179,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7201", vectors, groups, ...@@ -179,7 +179,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7201", vectors, groups,
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -200,7 +200,7 @@ static struct platform_device scif0_device = { ...@@ -200,7 +200,7 @@ static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = { static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -221,7 +221,7 @@ static struct platform_device scif1_device = { ...@@ -221,7 +221,7 @@ static struct platform_device scif1_device = {
static struct plat_sci_port scif2_platform_data = { static struct plat_sci_port scif2_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -242,7 +242,7 @@ static struct platform_device scif2_device = { ...@@ -242,7 +242,7 @@ static struct platform_device scif2_device = {
static struct plat_sci_port scif3_platform_data = { static struct plat_sci_port scif3_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -263,7 +263,7 @@ static struct platform_device scif3_device = { ...@@ -263,7 +263,7 @@ static struct platform_device scif3_device = {
static struct plat_sci_port scif4_platform_data = { static struct plat_sci_port scif4_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -284,7 +284,7 @@ static struct platform_device scif4_device = { ...@@ -284,7 +284,7 @@ static struct platform_device scif4_device = {
static struct plat_sci_port scif5_platform_data = { static struct plat_sci_port scif5_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -305,7 +305,7 @@ static struct platform_device scif5_device = { ...@@ -305,7 +305,7 @@ static struct platform_device scif5_device = {
static struct plat_sci_port scif6_platform_data = { static struct plat_sci_port scif6_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -326,7 +326,7 @@ static struct platform_device scif6_device = { ...@@ -326,7 +326,7 @@ static struct platform_device scif6_device = {
static struct plat_sci_port scif7_platform_data = { static struct plat_sci_port scif7_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
......
arch/sh/kernel/cpu/sh2a/setup-sh7203.c
View file @ c3fa400b
...@@ -175,8 +175,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7203", vectors, groups, ...@@ -175,8 +175,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7203", vectors, groups,
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE | .scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_REIE,
SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -198,8 +197,7 @@ static struct platform_device scif0_device = { ...@@ -198,8 +197,7 @@ static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = { static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE | .scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_REIE,
SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -221,8 +219,7 @@ static struct platform_device scif1_device = { ...@@ -221,8 +219,7 @@ static struct platform_device scif1_device = {
static struct plat_sci_port scif2_platform_data = { static struct plat_sci_port scif2_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE | .scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_REIE,
SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -244,8 +241,7 @@ static struct platform_device scif2_device = { ...@@ -244,8 +241,7 @@ static struct platform_device scif2_device = {
static struct plat_sci_port scif3_platform_data = { static struct plat_sci_port scif3_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE | .scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_REIE,
SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
}; };
......
arch/sh/kernel/cpu/sh2a/setup-sh7206.c
View file @ c3fa400b
...@@ -135,7 +135,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7206", vectors, groups, ...@@ -135,7 +135,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7206", vectors, groups,
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -156,7 +156,7 @@ static struct platform_device scif0_device = { ...@@ -156,7 +156,7 @@ static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = { static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -177,7 +177,7 @@ static struct platform_device scif1_device = { ...@@ -177,7 +177,7 @@ static struct platform_device scif1_device = {
static struct plat_sci_port scif2_platform_data = { static struct plat_sci_port scif2_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -198,7 +198,7 @@ static struct platform_device scif2_device = { ...@@ -198,7 +198,7 @@ static struct platform_device scif2_device = {
static struct plat_sci_port scif3_platform_data = { static struct plat_sci_port scif3_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
......
arch/sh/kernel/cpu/sh2a/setup-sh7264.c
View file @ c3fa400b
...@@ -227,8 +227,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7264", vectors, groups, ...@@ -227,8 +227,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7264", vectors, groups,
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE | .scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_REIE | SCSCR_TOIE,
SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -253,8 +252,7 @@ static struct platform_device scif0_device = { ...@@ -253,8 +252,7 @@ static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = { static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE | .scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_REIE | SCSCR_TOIE,
SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -279,8 +277,7 @@ static struct platform_device scif1_device = { ...@@ -279,8 +277,7 @@ static struct platform_device scif1_device = {
static struct plat_sci_port scif2_platform_data = { static struct plat_sci_port scif2_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE | .scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_REIE | SCSCR_TOIE,
SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -305,8 +302,7 @@ static struct platform_device scif2_device = { ...@@ -305,8 +302,7 @@ static struct platform_device scif2_device = {
static struct plat_sci_port scif3_platform_data = { static struct plat_sci_port scif3_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE | .scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_REIE | SCSCR_TOIE,
SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -331,8 +327,7 @@ static struct platform_device scif3_device = { ...@@ -331,8 +327,7 @@ static struct platform_device scif3_device = {
static struct plat_sci_port scif4_platform_data = { static struct plat_sci_port scif4_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE | .scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_REIE | SCSCR_TOIE,
SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -357,8 +352,7 @@ static struct platform_device scif4_device = { ...@@ -357,8 +352,7 @@ static struct platform_device scif4_device = {
static struct plat_sci_port scif5_platform_data = { static struct plat_sci_port scif5_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE | .scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_REIE | SCSCR_TOIE,
SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -383,8 +377,7 @@ static struct platform_device scif5_device = { ...@@ -383,8 +377,7 @@ static struct platform_device scif5_device = {
static struct plat_sci_port scif6_platform_data = { static struct plat_sci_port scif6_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE | .scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_REIE | SCSCR_TOIE,
SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -409,8 +402,7 @@ static struct platform_device scif6_device = { ...@@ -409,8 +402,7 @@ static struct platform_device scif6_device = {
static struct plat_sci_port scif7_platform_data = { static struct plat_sci_port scif7_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE | .scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_REIE | SCSCR_TOIE,
SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
}; };
......
arch/sh/kernel/cpu/sh2a/setup-sh7269.c
View file @ c3fa400b
...@@ -249,8 +249,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7269", vectors, groups, ...@@ -249,8 +249,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7269", vectors, groups,
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE | .scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_REIE | SCSCR_TOIE,
SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -275,8 +274,7 @@ static struct platform_device scif0_device = { ...@@ -275,8 +274,7 @@ static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = { static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE | .scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_REIE | SCSCR_TOIE,
SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -301,8 +299,7 @@ static struct platform_device scif1_device = { ...@@ -301,8 +299,7 @@ static struct platform_device scif1_device = {
static struct plat_sci_port scif2_platform_data = { static struct plat_sci_port scif2_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE | .scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_REIE | SCSCR_TOIE,
SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -327,8 +324,7 @@ static struct platform_device scif2_device = { ...@@ -327,8 +324,7 @@ static struct platform_device scif2_device = {
static struct plat_sci_port scif3_platform_data = { static struct plat_sci_port scif3_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE | .scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_REIE | SCSCR_TOIE,
SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -353,8 +349,7 @@ static struct platform_device scif3_device = { ...@@ -353,8 +349,7 @@ static struct platform_device scif3_device = {
static struct plat_sci_port scif4_platform_data = { static struct plat_sci_port scif4_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE | .scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_REIE | SCSCR_TOIE,
SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -379,8 +374,7 @@ static struct platform_device scif4_device = { ...@@ -379,8 +374,7 @@ static struct platform_device scif4_device = {
static struct plat_sci_port scif5_platform_data = { static struct plat_sci_port scif5_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE | .scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_REIE | SCSCR_TOIE,
SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -405,8 +399,7 @@ static struct platform_device scif5_device = { ...@@ -405,8 +399,7 @@ static struct platform_device scif5_device = {
static struct plat_sci_port scif6_platform_data = { static struct plat_sci_port scif6_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE | .scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_REIE | SCSCR_TOIE,
SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -431,8 +424,7 @@ static struct platform_device scif6_device = { ...@@ -431,8 +424,7 @@ static struct platform_device scif6_device = {
static struct plat_sci_port scif7_platform_data = { static struct plat_sci_port scif7_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE | .scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_REIE | SCSCR_TOIE,
SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
}; };
......
arch/sh/kernel/cpu/sh3/setup-sh7705.c
View file @ c3fa400b
...@@ -71,8 +71,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7705", vectors, NULL, ...@@ -71,8 +71,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7705", vectors, NULL,
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_TIE | SCSCR_RIE | SCSCR_TE | .scscr = SCSCR_TIE | SCSCR_RIE | SCSCR_CKE1 | SCSCR_CKE0,
SCSCR_RE | SCSCR_CKE1 | SCSCR_CKE0,
.type = PORT_SCIF, .type = PORT_SCIF,
.ops = &sh770x_sci_port_ops, .ops = &sh770x_sci_port_ops,
.regtype = SCIx_SH7705_SCIF_REGTYPE, .regtype = SCIx_SH7705_SCIF_REGTYPE,
...@@ -95,7 +94,7 @@ static struct platform_device scif0_device = { ...@@ -95,7 +94,7 @@ static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = { static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_TIE | SCSCR_RIE | SCSCR_TE | SCSCR_RE, .scscr = SCSCR_TIE | SCSCR_RIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.ops = &sh770x_sci_port_ops, .ops = &sh770x_sci_port_ops,
.regtype = SCIx_SH7705_SCIF_REGTYPE, .regtype = SCIx_SH7705_SCIF_REGTYPE,
......
arch/sh/kernel/cpu/sh3/setup-sh770x.c
View file @ c3fa400b
...@@ -111,7 +111,6 @@ static struct platform_device rtc_device = { ...@@ -111,7 +111,6 @@ static struct platform_device rtc_device = {
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.port_reg = 0xa4000136, .port_reg = 0xa4000136,
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_TE | SCSCR_RE,
.type = PORT_SCI, .type = PORT_SCI,
.ops = &sh770x_sci_port_ops, .ops = &sh770x_sci_port_ops,
.regshift = 1, .regshift = 1,
...@@ -136,7 +135,6 @@ static struct platform_device scif0_device = { ...@@ -136,7 +135,6 @@ static struct platform_device scif0_device = {
defined(CONFIG_CPU_SUBTYPE_SH7709) defined(CONFIG_CPU_SUBTYPE_SH7709)
static struct plat_sci_port scif1_platform_data = { static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_TE | SCSCR_RE,
.type = PORT_SCIF, .type = PORT_SCIF,
.ops = &sh770x_sci_port_ops, .ops = &sh770x_sci_port_ops,
.regtype = SCIx_SH3_SCIF_REGTYPE, .regtype = SCIx_SH3_SCIF_REGTYPE,
...@@ -162,7 +160,6 @@ static struct platform_device scif1_device = { ...@@ -162,7 +160,6 @@ static struct platform_device scif1_device = {
static struct plat_sci_port scif2_platform_data = { static struct plat_sci_port scif2_platform_data = {
.port_reg = SCIx_NOT_SUPPORTED, .port_reg = SCIx_NOT_SUPPORTED,
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_TE | SCSCR_RE,
.type = PORT_IRDA, .type = PORT_IRDA,
.ops = &sh770x_sci_port_ops, .ops = &sh770x_sci_port_ops,
.regshift = 1, .regshift = 1,
......
arch/sh/kernel/cpu/sh3/setup-sh7710.c
View file @ c3fa400b
...@@ -99,8 +99,7 @@ static struct platform_device rtc_device = { ...@@ -99,8 +99,7 @@ static struct platform_device rtc_device = {
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_TE | SCSCR_RE | SCSCR_REIE | .scscr = SCSCR_REIE | SCSCR_CKE1 | SCSCR_CKE0,
SCSCR_CKE1 | SCSCR_CKE0,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -121,8 +120,7 @@ static struct platform_device scif0_device = { ...@@ -121,8 +120,7 @@ static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = { static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_TE | SCSCR_RE | SCSCR_REIE | .scscr = SCSCR_REIE | SCSCR_CKE1 | SCSCR_CKE0,
SCSCR_CKE1 | SCSCR_CKE0,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
......
arch/sh/kernel/cpu/sh3/setup-sh7720.c
View file @ c3fa400b
...@@ -53,7 +53,6 @@ static struct platform_device rtc_device = { ...@@ -53,7 +53,6 @@ static struct platform_device rtc_device = {
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE,
.type = PORT_SCIF, .type = PORT_SCIF,
.ops = &sh7720_sci_port_ops, .ops = &sh7720_sci_port_ops,
.regtype = SCIx_SH7705_SCIF_REGTYPE, .regtype = SCIx_SH7705_SCIF_REGTYPE,
...@@ -76,7 +75,6 @@ static struct platform_device scif0_device = { ...@@ -76,7 +75,6 @@ static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = { static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE,
.type = PORT_SCIF, .type = PORT_SCIF,
.ops = &sh7720_sci_port_ops, .ops = &sh7720_sci_port_ops,
.regtype = SCIx_SH7705_SCIF_REGTYPE, .regtype = SCIx_SH7705_SCIF_REGTYPE,
......
arch/sh/kernel/cpu/sh4/setup-sh4-202.c
View file @ c3fa400b
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
......
arch/sh/kernel/cpu/sh4/setup-sh7750.c
View file @ c3fa400b
...@@ -40,7 +40,6 @@ static struct platform_device rtc_device = { ...@@ -40,7 +40,6 @@ static struct platform_device rtc_device = {
static struct plat_sci_port sci_platform_data = { static struct plat_sci_port sci_platform_data = {
.port_reg = 0xffe0001C, .port_reg = 0xffe0001C,
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_TE | SCSCR_RE,
.type = PORT_SCI, .type = PORT_SCI,
.regshift = 2, .regshift = 2,
}; };
...@@ -62,7 +61,7 @@ static struct platform_device sci_device = { ...@@ -62,7 +61,7 @@ static struct platform_device sci_device = {
static struct plat_sci_port scif_platform_data = { static struct plat_sci_port scif_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_TE | SCSCR_RE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
......
arch/sh/kernel/cpu/sh4/setup-sh7760.c
View file @ c3fa400b
...@@ -129,7 +129,7 @@ static DECLARE_INTC_DESC(intc_desc_irq, "sh7760-irq", vectors_irq, groups, ...@@ -129,7 +129,7 @@ static DECLARE_INTC_DESC(intc_desc_irq, "sh7760-irq", vectors_irq, groups,
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -155,7 +155,7 @@ static struct platform_device scif0_device = { ...@@ -155,7 +155,7 @@ static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = { static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.type = PORT_SCIF, .type = PORT_SCIF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -179,7 +179,7 @@ static struct platform_device scif1_device = { ...@@ -179,7 +179,7 @@ static struct platform_device scif1_device = {
static struct plat_sci_port scif2_platform_data = { static struct plat_sci_port scif2_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -204,7 +204,7 @@ static struct platform_device scif2_device = { ...@@ -204,7 +204,7 @@ static struct platform_device scif2_device = {
static struct plat_sci_port scif3_platform_data = { static struct plat_sci_port scif3_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCI, .type = PORT_SCI,
.regshift = 2, .regshift = 2,
}; };
......
arch/sh/kernel/cpu/sh4a/setup-sh7343.c
View file @ c3fa400b
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
/* Serial */ /* Serial */
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_CKE1, .scscr = SCSCR_CKE1,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -40,7 +40,7 @@ static struct platform_device scif0_device = { ...@@ -40,7 +40,7 @@ static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = { static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_CKE1, .scscr = SCSCR_CKE1,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -61,7 +61,7 @@ static struct platform_device scif1_device = { ...@@ -61,7 +61,7 @@ static struct platform_device scif1_device = {
static struct plat_sci_port scif2_platform_data = { static struct plat_sci_port scif2_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_CKE1, .scscr = SCSCR_CKE1,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -82,7 +82,7 @@ static struct platform_device scif2_device = { ...@@ -82,7 +82,7 @@ static struct platform_device scif2_device = {
static struct plat_sci_port scif3_platform_data = { static struct plat_sci_port scif3_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_CKE1, .scscr = SCSCR_CKE1,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
......
arch/sh/kernel/cpu/sh4a/setup-sh7366.c
View file @ c3fa400b
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.port_reg = 0xa405013e, .port_reg = 0xa405013e,
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
......
arch/sh/kernel/cpu/sh4a/setup-sh7722.c
View file @ c3fa400b
...@@ -180,7 +180,7 @@ struct platform_device dma_device = { ...@@ -180,7 +180,7 @@ struct platform_device dma_device = {
/* Serial */ /* Serial */
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.ops = &sh7722_sci_port_ops, .ops = &sh7722_sci_port_ops,
.regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE, .regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,
...@@ -203,7 +203,7 @@ static struct platform_device scif0_device = { ...@@ -203,7 +203,7 @@ static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = { static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.ops = &sh7722_sci_port_ops, .ops = &sh7722_sci_port_ops,
.regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE, .regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,
...@@ -226,7 +226,7 @@ static struct platform_device scif1_device = { ...@@ -226,7 +226,7 @@ static struct platform_device scif1_device = {
static struct plat_sci_port scif2_platform_data = { static struct plat_sci_port scif2_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.ops = &sh7722_sci_port_ops, .ops = &sh7722_sci_port_ops,
.regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE, .regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,
......
arch/sh/kernel/cpu/sh4a/setup-sh7723.c
View file @ c3fa400b
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.port_reg = 0xa4050160, .port_reg = 0xa4050160,
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE, .regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,
}; };
...@@ -48,7 +48,7 @@ static struct platform_device scif0_device = { ...@@ -48,7 +48,7 @@ static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = { static struct plat_sci_port scif1_platform_data = {
.port_reg = SCIx_NOT_SUPPORTED, .port_reg = SCIx_NOT_SUPPORTED,
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE, .regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,
}; };
...@@ -71,7 +71,7 @@ static struct platform_device scif1_device = { ...@@ -71,7 +71,7 @@ static struct platform_device scif1_device = {
static struct plat_sci_port scif2_platform_data = { static struct plat_sci_port scif2_platform_data = {
.port_reg = SCIx_NOT_SUPPORTED, .port_reg = SCIx_NOT_SUPPORTED,
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE, .regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,
}; };
...@@ -94,7 +94,7 @@ static struct platform_device scif2_device = { ...@@ -94,7 +94,7 @@ static struct platform_device scif2_device = {
static struct plat_sci_port scif3_platform_data = { static struct plat_sci_port scif3_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.port_reg = SCIx_NOT_SUPPORTED, .port_reg = SCIx_NOT_SUPPORTED,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.sampling_rate = 8, .sampling_rate = 8,
.type = PORT_SCIFA, .type = PORT_SCIFA,
}; };
...@@ -117,7 +117,7 @@ static struct platform_device scif3_device = { ...@@ -117,7 +117,7 @@ static struct platform_device scif3_device = {
static struct plat_sci_port scif4_platform_data = { static struct plat_sci_port scif4_platform_data = {
.port_reg = SCIx_NOT_SUPPORTED, .port_reg = SCIx_NOT_SUPPORTED,
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.sampling_rate = 8, .sampling_rate = 8,
.type = PORT_SCIFA, .type = PORT_SCIFA,
}; };
...@@ -140,7 +140,7 @@ static struct platform_device scif4_device = { ...@@ -140,7 +140,7 @@ static struct platform_device scif4_device = {
static struct plat_sci_port scif5_platform_data = { static struct plat_sci_port scif5_platform_data = {
.port_reg = SCIx_NOT_SUPPORTED, .port_reg = SCIx_NOT_SUPPORTED,
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.sampling_rate = 8, .sampling_rate = 8,
.type = PORT_SCIFA, .type = PORT_SCIFA,
}; };
......
arch/sh/kernel/cpu/sh4a/setup-sh7724.c
View file @ c3fa400b
...@@ -292,7 +292,7 @@ static struct platform_device dma1_device = { ...@@ -292,7 +292,7 @@ static struct platform_device dma1_device = {
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.port_reg = SCIx_NOT_SUPPORTED, .port_reg = SCIx_NOT_SUPPORTED,
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE, .regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,
}; };
...@@ -315,7 +315,7 @@ static struct platform_device scif0_device = { ...@@ -315,7 +315,7 @@ static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = { static struct plat_sci_port scif1_platform_data = {
.port_reg = SCIx_NOT_SUPPORTED, .port_reg = SCIx_NOT_SUPPORTED,
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE, .regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,
}; };
...@@ -338,7 +338,7 @@ static struct platform_device scif1_device = { ...@@ -338,7 +338,7 @@ static struct platform_device scif1_device = {
static struct plat_sci_port scif2_platform_data = { static struct plat_sci_port scif2_platform_data = {
.port_reg = SCIx_NOT_SUPPORTED, .port_reg = SCIx_NOT_SUPPORTED,
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE, .regtype = SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,
}; };
...@@ -361,7 +361,6 @@ static struct platform_device scif2_device = { ...@@ -361,7 +361,6 @@ static struct platform_device scif2_device = {
static struct plat_sci_port scif3_platform_data = { static struct plat_sci_port scif3_platform_data = {
.port_reg = SCIx_NOT_SUPPORTED, .port_reg = SCIx_NOT_SUPPORTED,
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE,
.sampling_rate = 8, .sampling_rate = 8,
.type = PORT_SCIFA, .type = PORT_SCIFA,
}; };
...@@ -384,7 +383,6 @@ static struct platform_device scif3_device = { ...@@ -384,7 +383,6 @@ static struct platform_device scif3_device = {
static struct plat_sci_port scif4_platform_data = { static struct plat_sci_port scif4_platform_data = {
.port_reg = SCIx_NOT_SUPPORTED, .port_reg = SCIx_NOT_SUPPORTED,
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE,
.sampling_rate = 8, .sampling_rate = 8,
.type = PORT_SCIFA, .type = PORT_SCIFA,
}; };
...@@ -407,7 +405,6 @@ static struct platform_device scif4_device = { ...@@ -407,7 +405,6 @@ static struct platform_device scif4_device = {
static struct plat_sci_port scif5_platform_data = { static struct plat_sci_port scif5_platform_data = {
.port_reg = SCIx_NOT_SUPPORTED, .port_reg = SCIx_NOT_SUPPORTED,
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE,
.sampling_rate = 8, .sampling_rate = 8,
.type = PORT_SCIFA, .type = PORT_SCIFA,
}; };
......
arch/sh/kernel/cpu/sh4a/setup-sh7734.c
View file @ c3fa400b
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
/* SCIF */ /* SCIF */
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_BRG_REGTYPE, .regtype = SCIx_SH4_SCIF_BRG_REGTYPE,
}; };
...@@ -48,7 +48,7 @@ static struct platform_device scif0_device = { ...@@ -48,7 +48,7 @@ static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = { static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_BRG_REGTYPE, .regtype = SCIx_SH4_SCIF_BRG_REGTYPE,
}; };
...@@ -70,7 +70,7 @@ static struct platform_device scif1_device = { ...@@ -70,7 +70,7 @@ static struct platform_device scif1_device = {
static struct plat_sci_port scif2_platform_data = { static struct plat_sci_port scif2_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_BRG_REGTYPE, .regtype = SCIx_SH4_SCIF_BRG_REGTYPE,
}; };
...@@ -92,7 +92,7 @@ static struct platform_device scif2_device = { ...@@ -92,7 +92,7 @@ static struct platform_device scif2_device = {
static struct plat_sci_port scif3_platform_data = { static struct plat_sci_port scif3_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE, .scscr = SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_BRG_REGTYPE, .regtype = SCIx_SH4_SCIF_BRG_REGTYPE,
}; };
...@@ -114,7 +114,7 @@ static struct platform_device scif3_device = { ...@@ -114,7 +114,7 @@ static struct platform_device scif3_device = {
static struct plat_sci_port scif4_platform_data = { static struct plat_sci_port scif4_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_BRG_REGTYPE, .regtype = SCIx_SH4_SCIF_BRG_REGTYPE,
}; };
...@@ -136,7 +136,7 @@ static struct platform_device scif4_device = { ...@@ -136,7 +136,7 @@ static struct platform_device scif4_device = {
static struct plat_sci_port scif5_platform_data = { static struct plat_sci_port scif5_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_BRG_REGTYPE, .regtype = SCIx_SH4_SCIF_BRG_REGTYPE,
}; };
......
arch/sh/kernel/cpu/sh4a/setup-sh7757.c
View file @ c3fa400b
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
static struct plat_sci_port scif2_platform_data = { static struct plat_sci_port scif2_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -46,7 +46,7 @@ static struct platform_device scif2_device = { ...@@ -46,7 +46,7 @@ static struct platform_device scif2_device = {
static struct plat_sci_port scif3_platform_data = { static struct plat_sci_port scif3_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -67,7 +67,7 @@ static struct platform_device scif3_device = { ...@@ -67,7 +67,7 @@ static struct platform_device scif3_device = {
static struct plat_sci_port scif4_platform_data = { static struct plat_sci_port scif4_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
......
arch/sh/kernel/cpu/sh4a/setup-sh7763.c
View file @ c3fa400b
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -42,7 +42,7 @@ static struct platform_device scif0_device = { ...@@ -42,7 +42,7 @@ static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = { static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -64,7 +64,7 @@ static struct platform_device scif1_device = { ...@@ -64,7 +64,7 @@ static struct platform_device scif1_device = {
static struct plat_sci_port scif2_platform_data = { static struct plat_sci_port scif2_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
}; };
......
arch/sh/kernel/cpu/sh4a/setup-sh7770.c
View file @ c3fa400b
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE, .scscr = SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -38,7 +38,7 @@ static struct platform_device scif0_device = { ...@@ -38,7 +38,7 @@ static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = { static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE, .scscr = SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -59,7 +59,7 @@ static struct platform_device scif1_device = { ...@@ -59,7 +59,7 @@ static struct platform_device scif1_device = {
static struct plat_sci_port scif2_platform_data = { static struct plat_sci_port scif2_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE, .scscr = SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -80,7 +80,7 @@ static struct platform_device scif2_device = { ...@@ -80,7 +80,7 @@ static struct platform_device scif2_device = {
static struct plat_sci_port scif3_platform_data = { static struct plat_sci_port scif3_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE, .scscr = SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -101,7 +101,7 @@ static struct platform_device scif3_device = { ...@@ -101,7 +101,7 @@ static struct platform_device scif3_device = {
static struct plat_sci_port scif4_platform_data = { static struct plat_sci_port scif4_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE, .scscr = SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -122,7 +122,7 @@ static struct platform_device scif4_device = { ...@@ -122,7 +122,7 @@ static struct platform_device scif4_device = {
static struct plat_sci_port scif5_platform_data = { static struct plat_sci_port scif5_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE, .scscr = SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -143,7 +143,7 @@ static struct platform_device scif5_device = { ...@@ -143,7 +143,7 @@ static struct platform_device scif5_device = {
static struct plat_sci_port scif6_platform_data = { static struct plat_sci_port scif6_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE, .scscr = SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -164,7 +164,7 @@ static struct platform_device scif6_device = { ...@@ -164,7 +164,7 @@ static struct platform_device scif6_device = {
static struct plat_sci_port scif7_platform_data = { static struct plat_sci_port scif7_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE, .scscr = SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -185,7 +185,7 @@ static struct platform_device scif7_device = { ...@@ -185,7 +185,7 @@ static struct platform_device scif7_device = {
static struct plat_sci_port scif8_platform_data = { static struct plat_sci_port scif8_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE, .scscr = SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -206,7 +206,7 @@ static struct platform_device scif8_device = { ...@@ -206,7 +206,7 @@ static struct platform_device scif8_device = {
static struct plat_sci_port scif9_platform_data = { static struct plat_sci_port scif9_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE, .scscr = SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
......
arch/sh/kernel/cpu/sh4a/setup-sh7780.c
View file @ c3fa400b
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1, .scscr = SCSCR_REIE | SCSCR_CKE1,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -41,7 +41,7 @@ static struct platform_device scif0_device = { ...@@ -41,7 +41,7 @@ static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = { static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1, .scscr = SCSCR_REIE | SCSCR_CKE1,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
}; };
......
arch/sh/kernel/cpu/sh4a/setup-sh7785.c
View file @ c3fa400b
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1, .scscr = SCSCR_REIE | SCSCR_CKE1,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -43,7 +43,7 @@ static struct platform_device scif0_device = { ...@@ -43,7 +43,7 @@ static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = { static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1, .scscr = SCSCR_REIE | SCSCR_CKE1,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -65,7 +65,7 @@ static struct platform_device scif1_device = { ...@@ -65,7 +65,7 @@ static struct platform_device scif1_device = {
static struct plat_sci_port scif2_platform_data = { static struct plat_sci_port scif2_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1, .scscr = SCSCR_REIE | SCSCR_CKE1,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -87,7 +87,7 @@ static struct platform_device scif2_device = { ...@@ -87,7 +87,7 @@ static struct platform_device scif2_device = {
static struct plat_sci_port scif3_platform_data = { static struct plat_sci_port scif3_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1, .scscr = SCSCR_REIE | SCSCR_CKE1,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -109,7 +109,7 @@ static struct platform_device scif3_device = { ...@@ -109,7 +109,7 @@ static struct platform_device scif3_device = {
static struct plat_sci_port scif4_platform_data = { static struct plat_sci_port scif4_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1, .scscr = SCSCR_REIE | SCSCR_CKE1,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -131,7 +131,7 @@ static struct platform_device scif4_device = { ...@@ -131,7 +131,7 @@ static struct platform_device scif4_device = {
static struct plat_sci_port scif5_platform_data = { static struct plat_sci_port scif5_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1, .scscr = SCSCR_REIE | SCSCR_CKE1,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
}; };
......
arch/sh/kernel/cpu/sh4a/setup-sh7786.c
View file @ c3fa400b
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1, .scscr = SCSCR_REIE | SCSCR_CKE1,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -57,7 +57,7 @@ static struct platform_device scif0_device = { ...@@ -57,7 +57,7 @@ static struct platform_device scif0_device = {
*/ */
static struct plat_sci_port scif1_platform_data = { static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1, .scscr = SCSCR_REIE | SCSCR_CKE1,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -88,7 +88,7 @@ static struct platform_device scif1_device = { ...@@ -88,7 +88,7 @@ static struct platform_device scif1_device = {
static struct plat_sci_port scif2_platform_data = { static struct plat_sci_port scif2_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1, .scscr = SCSCR_REIE | SCSCR_CKE1,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -110,7 +110,7 @@ static struct platform_device scif2_device = { ...@@ -110,7 +110,7 @@ static struct platform_device scif2_device = {
static struct plat_sci_port scif3_platform_data = { static struct plat_sci_port scif3_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1, .scscr = SCSCR_REIE | SCSCR_CKE1,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -132,7 +132,7 @@ static struct platform_device scif3_device = { ...@@ -132,7 +132,7 @@ static struct platform_device scif3_device = {
static struct plat_sci_port scif4_platform_data = { static struct plat_sci_port scif4_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1, .scscr = SCSCR_REIE | SCSCR_CKE1,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
}; };
...@@ -154,7 +154,7 @@ static struct platform_device scif4_device = { ...@@ -154,7 +154,7 @@ static struct platform_device scif4_device = {
static struct plat_sci_port scif5_platform_data = { static struct plat_sci_port scif5_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_CKE1, .scscr = SCSCR_REIE | SCSCR_CKE1,
.type = PORT_SCIF, .type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE, .regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
}; };
......
arch/sh/kernel/cpu/sh4a/setup-shx3.c
View file @ c3fa400b
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
*/ */
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -53,7 +53,7 @@ static struct platform_device scif0_device = { ...@@ -53,7 +53,7 @@ static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = { static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
...@@ -77,7 +77,7 @@ static struct platform_device scif1_device = { ...@@ -77,7 +77,7 @@ static struct platform_device scif1_device = {
static struct plat_sci_port scif2_platform_data = { static struct plat_sci_port scif2_platform_data = {
.flags = UPF_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
......
arch/sh/kernel/cpu/sh5/setup-sh5.c
View file @ c3fa400b
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP, .flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP,
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scscr = SCSCR_REIE,
.type = PORT_SCIF, .type = PORT_SCIF,
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7