sh: Don't set the sh-sci platform data scscr CKE0 bit

The bit is only set by platforms that also set the CKE1 but, in which
case its value is ignored by the device. Don't set it, this simplifies
platform data and only leaves the CKE1 bit to be handled.

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>

diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7705.c b/arch/sh/kernel/cpu/sh3/setup-sh7705.c
index a60edd8f3db730ec6165c22bfcea2c0fbb11dd6e..f6e392e0d27eb67ee3c118d382df528029d82dc9 100644 (file)
--- a/arch/sh/kernel/cpu/sh3/setup-sh7705.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7705.c
@@ -70,7 +70,7 @@ static DECLARE_INTC_DESC(intc_desc, "sh7705", vectors, NULL,
                         NULL, prio_registers, NULL);
 
 static struct plat_sci_port scif0_platform_data = {
-       .scscr          = SCSCR_CKE1 | SCSCR_CKE0,
+       .scscr          = SCSCR_CKE1,
        .type           = PORT_SCIF,
        .ops            = &sh770x_sci_port_ops,
        .regtype        = SCIx_SH7705_SCIF_REGTYPE,

diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7710.c b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
index ac2a0aabcec50a3d9ed7ddd62f1ba2aec2619236..ea52410b430d2e1597e539144a2e89dc6459f807 100644 (file)
--- a/arch/sh/kernel/cpu/sh3/setup-sh7710.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
@@ -98,7 +98,7 @@ static struct platform_device rtc_device = {
 };
 
 static struct plat_sci_port scif0_platform_data = {
-       .scscr          = SCSCR_REIE | SCSCR_CKE1 | SCSCR_CKE0,
+       .scscr          = SCSCR_REIE | SCSCR_CKE1,
        .type           = PORT_SCIF,
 };
 
@@ -118,7 +118,7 @@ static struct platform_device scif0_device = {
 };
 
 static struct plat_sci_port scif1_platform_data = {
-       .scscr          = SCSCR_REIE | SCSCR_CKE1 | SCSCR_CKE0,
+       .scscr          = SCSCR_REIE | SCSCR_CKE1,
        .type           = PORT_SCIF,
 };