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

Groups > linux.kernel > #1391120

[PATCH v2 09/11] serial: sh-sci: Add pin initialization for SCIFA/SCIFB

Show all headers | View raw

Before, the driver relied on initialization by the boot loader, or by
implicit reset state.

Note that unlike on (H)SCIF, the RTS/CTS bits exist only if dedicated
RTS/CTS pins are available, which depends on the SoC and UART instance.

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

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index c46999f20917964e..b9d027af0f3e71f6 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -712,7 +712,21 @@ static void sci_init_pins(struct uart_port *port, unsigned int cflag)
 		return;
 	}
 
-	if (sci_getreg(port, SCSPTR)->size) {
+	if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) {
+		u16 ctrl = serial_port_in(port, SCPCR);
+
+		/* Enable RXD and TXD pin functions */
+		ctrl &= ~(SCPCR_RXDC | SCPCR_TXDC);
+		if (to_sci_port(port)->cfg->capabilities & SCIx_HAVE_RTSCTS) {
+			/* RTS# is output, driven 1 */
+			ctrl |= SCPCR_RTSC;
+			serial_port_out(port, SCPDR,
+				serial_port_in(port, SCPDR) | SCPDR_RTSD);
+			/* Enable CTS# pin function */
+			ctrl &= ~SCPCR_CTSC;
+		}
+		serial_port_out(port, SCPCR, ctrl);
+	} else if (sci_getreg(port, SCSPTR)->size) {
 		u16 status = serial_port_in(port, SCSPTR);
 
 		/* RTS# is output, driven 1 */
-- 
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