Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1391105

[PATCH v2 08/11] serial: sh-sci: Correct pin initialization on (H)SCIF

Show all headers | View raw

Correct pin initialization on (H)SCIF:
  - RTS must be deasserted (it's active low),
  - SCK must be an input, as it may be used as the optional external
    clock input.

Initial pin configuration must always be done:
  - Regardless of the presence of dedicated RTS and CTS pins: if the
    register exists, the RTS/CTS bits exist, too,
  - Regardless of hardware flow control being enabled or not: RTS must
    be deasserted.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - New.
---
 drivers/tty/serial/sh-sci.c | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index ce7bd165929ea078..c46999f20917964e 100644
--- 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);
 	}
 }
 
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 00/11] serial: sh-sci: Hardware Flow Control Updates Geert Uytterhoeven <geert+renesas@glider.be> - 2016-04-29 15:00 +0200
  [PATCH v2 02/11] serial: sh-sci: Update DT binding documentation for dedicated RTS/CTS Geert Uytterhoeven <geert+renesas@glider.be> - 2016-04-29 15:10 +0200
    Re: [PATCH v2 02/11] serial: sh-sci: Update DT binding documentation  for dedicated RTS/CTS Rob Herring <robh@kernel.org> - 2016-05-03 20:10 +0200
  [PATCH v2 08/11] serial: sh-sci: Correct pin initialization on (H)SCIF Geert Uytterhoeven <geert+renesas@glider.be> - 2016-04-29 15:10 +0200
    Re: [PATCH v2 08/11] serial: sh-sci: Correct pin initialization on  (H)SCIF Peter Hurley <peter@hurleysoftware.com> - 2016-04-29 18:00 +0200
      Re: [PATCH v2 08/11] serial: sh-sci: Correct pin initialization on (H)SCIF Geert Uytterhoeven <geert@linux-m68k.org> - 2016-04-29 22:10 +0200
  [PATCH v2 11/11] serial: sh-sci: Add DT support for dedicated RTS/CTS Geert Uytterhoeven <geert+renesas@glider.be> - 2016-04-29 15:10 +0200
  [PATCH v2 01/11] serial: sh-sci: Update DT binding documentation for GPIO modem lines Geert Uytterhoeven <geert+renesas@glider.be> - 2016-04-29 15:10 +0200
  [PATCH v2 05/11] serial: sh-sci: Do not open-code sci_getreg() Geert Uytterhoeven <geert+renesas@glider.be> - 2016-04-29 15:10 +0200
    Re: [PATCH v2 05/11] serial: sh-sci: Do not open-code sci_getreg() Peter Hurley <peter@hurleysoftware.com> - 2016-04-29 17:40 +0200
  [PATCH v2 04/11] serial: sh-sci: Add support for GPIO-controlled modem lines Geert Uytterhoeven <geert+renesas@glider.be> - 2016-04-29 15:10 +0200
  [PATCH v2 06/11] serial: sh-sci: Add more Serial Port Register documentation Geert Uytterhoeven <geert+renesas@glider.be> - 2016-04-29 15:10 +0200
  [PATCH v2 03/11] serial: sh-sci: Always set TIOCM_CTS in .get_mctrl() callback Geert Uytterhoeven <geert+renesas@glider.be> - 2016-04-29 15:10 +0200
    Re: [PATCH v2 03/11] serial: sh-sci: Always set TIOCM_CTS in  .get_mctrl() callback Peter Hurley <peter@hurleysoftware.com> - 2016-04-29 17:40 +0200
  [PATCH v2 09/11] serial: sh-sci: Add pin initialization for SCIFA/SCIFB Geert Uytterhoeven <geert+renesas@glider.be> - 2016-04-29 15:10 +0200
  [PATCH v2 07/11] serial: sh-sci: Add more Serial Port Control/Data Register documentation Geert Uytterhoeven <geert+renesas@glider.be> - 2016-04-29 15:10 +0200

csiph-web