serial: sh-sci: Correct pin initialization on (H)SCIF

[linux-2.6-block.git] / drivers / tty / serial / sh-sci.c

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index ce7bd165929ea0783b8a288d0fe1f07e6e75b896..c46999f20917964e58364b1caaf9101ab93c916b 100644 (file)
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -712,21 +712,14 @@ static void sci_init_pins(struct uart_port *port, unsigned int cflag)
                return;
        }
 
-       /*
-        * For the generic path SCSPTR is necessary. Bail out if that's
-        * unavailable, too.
-        */
-       if (!sci_getreg(port, SCSPTR)->size)
-               return;
-
-       if ((s->cfg->capabilities & SCIx_HAVE_RTSCTS) &&
-           ((!(cflag & CRTSCTS)))) {
-               unsigned short status;
-
-               status = serial_port_in(port, SCSPTR);
-               status &= ~SCSPTR_CTSIO;
-               status |= SCSPTR_RTSIO;
-               serial_port_out(port, SCSPTR, status); /* Set RTS = 1 */
+       if (sci_getreg(port, SCSPTR)->size) {
+               u16 status = serial_port_in(port, SCSPTR);
+
+               /* RTS# is output, driven 1 */
+               status |= SCSPTR_RTSIO | SCSPTR_RTSDT;
+               /* CTS# and SCK are inputs */
+               status &= ~(SCSPTR_CTSIO | SCSPTR_SCKIO);
+               serial_port_out(port, SCSPTR, status);
        }
 }