summaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/cpu/sh4a/setup-sh7734.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2017-01-11 16:43:25 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-19 14:17:04 +0100
commitc3fa400b276325b57a20e1e54e6fcc18a98e962c (patch)
treec8e56f92e123eb455f02f9941872f4cafe159f8d /arch/sh/kernel/cpu/sh4a/setup-sh7734.c
parent3d73f32bfa312155a0990efd95803a3e7061140c (diff)
downloadblackbird-obmc-linux-c3fa400b276325b57a20e1e54e6fcc18a98e962c.tar.gz
blackbird-obmc-linux-c3fa400b276325b57a20e1e54e6fcc18a98e962c.zip
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: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/sh/kernel/cpu/sh4a/setup-sh7734.c')
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7734.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7734.c b/arch/sh/kernel/cpu/sh4a/setup-sh7734.c
index 69b8a50310d9..51910a8d8df4 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7734.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7734.c
@@ -26,7 +26,7 @@
/* SCIF */
static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF,
- .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
+ .scscr = SCSCR_REIE,
.type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_BRG_REGTYPE,
};
@@ -48,7 +48,7 @@ static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF,
- .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
+ .scscr = SCSCR_REIE,
.type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_BRG_REGTYPE,
};
@@ -70,7 +70,7 @@ static struct platform_device scif1_device = {
static struct plat_sci_port scif2_platform_data = {
.flags = UPF_BOOT_AUTOCONF,
- .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
+ .scscr = SCSCR_REIE,
.type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_BRG_REGTYPE,
};
@@ -92,7 +92,7 @@ static struct platform_device scif2_device = {
static struct plat_sci_port scif3_platform_data = {
.flags = UPF_BOOT_AUTOCONF,
- .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE,
+ .scscr = SCSCR_REIE | SCSCR_TOIE,
.type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_BRG_REGTYPE,
};
@@ -114,7 +114,7 @@ static struct platform_device scif3_device = {
static struct plat_sci_port scif4_platform_data = {
.flags = UPF_BOOT_AUTOCONF,
- .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
+ .scscr = SCSCR_REIE,
.type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_BRG_REGTYPE,
};
@@ -136,7 +136,7 @@ static struct platform_device scif4_device = {
static struct plat_sci_port scif5_platform_data = {
.flags = UPF_BOOT_AUTOCONF,
- .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
+ .scscr = SCSCR_REIE,
.type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_BRG_REGTYPE,
};
OpenPOWER on IntegriCloud