From: Magnus Damm <magnus.damm@gmail.com> To: linux-sh@vger.kernel.org Cc: gregkh@linuxfoundation.org, geert@glider.be, laurent.pinchart@ideasonboard.com, linux-serial@vger.kernel.org, Magnus Damm <magnus.damm@gmail.com>, jslaby@suse.cz Subject: [PATCH v2 01/05] serial: sh-sci: Break out default CTS/RTS pin setup Date: Thu, 19 Mar 2015 01:49:43 +0000 [thread overview] Message-ID: <20150319014943.14235.12896.sendpatchset@little-apple> (raw) In-Reply-To: <20150319014933.14235.44835.sendpatchset@little-apple> From: Magnus Damm <damm+renesas@opensource.se> Break out CTS/RTS pin setup for the default case. We only care about those pins in case SCIx_HAVE_RTSCTS is set. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> --- Changes since V1: - Function name change, thanks Laurent! drivers/tty/serial/sh-sci.c | 45 +++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) --- 0001/drivers/tty/serial/sh-sci.c +++ work/drivers/tty/serial/sh-sci.c 2015-03-19 09:07:40.616799151 +0900 @@ -509,10 +509,29 @@ static void sci_poll_put_char(struct uar } #endif /* CONFIG_CONSOLE_POLL || CONFIG_SERIAL_SH_SCI_CONSOLE */ -static void sci_init_pins(struct uart_port *port, unsigned int cflag) +static void sci_init_ctsrts_default(struct uart_port *port, bool hwflow_enabled) { struct sci_port *s = to_sci_port(port); struct plat_sci_reg *reg = sci_regmap[s->cfg->regtype] + SCSPTR; + unsigned short status; + + /* If no SCSPTR register exists then skip. Same if hardware flow + * control has been enabled, in such case SCFCR.MCE will be set + * and the SCSPTR configuration is assumed to be overridden. + */ + if (!reg->size || hwflow_enabled) + return; + + status = serial_port_in(port, SCSPTR); + status &= ~SCSPTR_CTSIO; + status |= SCSPTR_RTSIO; + serial_port_out(port, SCSPTR, status); /* Set RTS = 1 */ +} + +static void sci_init_pins(struct uart_port *port, unsigned int cflag) +{ + struct sci_port *s = to_sci_port(port); + bool hwflow_enabled = cflag & CRTSCTS; /* * Use port-specific handler if provided. @@ -522,22 +541,20 @@ static void sci_init_pins(struct uart_po return; } - /* - * For the generic path SCSPTR is necessary. Bail out if that's - * unavailable, too. + /* SCIF hardware with RTS/CTS support needs special setup below. + * + * Please note that if RTS/CTS is available for the hardware + * platform depends on the particular SCIF channel on a certain + * SoC, and how this channel has been hooked up on the actual board. + * + * If the RTS/CTS signals will be used or not depends on what user + * space requests. In case RTS/CTS is available but not requested + * by user space we still need to configure the pins somehow. */ - if (!reg->size) + if (!(s->cfg->capabilities & SCIx_HAVE_RTSCTS)) 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 */ - } + sci_init_ctsrts_default(port, hwflow_enabled); } static int sci_txfill(struct uart_port *port)
WARNING: multiple messages have this Message-ID (diff)
From: Magnus Damm <magnus.damm@gmail.com> To: linux-sh@vger.kernel.org Cc: gregkh@linuxfoundation.org, geert@glider.be, laurent.pinchart@ideasonboard.com, linux-serial@vger.kernel.org, Magnus Damm <magnus.damm@gmail.com>, jslaby@suse.cz Subject: [PATCH v2 01/05] serial: sh-sci: Break out default CTS/RTS pin setup Date: Thu, 19 Mar 2015 10:49:43 +0900 [thread overview] Message-ID: <20150319014943.14235.12896.sendpatchset@little-apple> (raw) In-Reply-To: <20150319014933.14235.44835.sendpatchset@little-apple> From: Magnus Damm <damm+renesas@opensource.se> Break out CTS/RTS pin setup for the default case. We only care about those pins in case SCIx_HAVE_RTSCTS is set. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> --- Changes since V1: - Function name change, thanks Laurent! drivers/tty/serial/sh-sci.c | 45 +++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) --- 0001/drivers/tty/serial/sh-sci.c +++ work/drivers/tty/serial/sh-sci.c 2015-03-19 09:07:40.616799151 +0900 @@ -509,10 +509,29 @@ static void sci_poll_put_char(struct uar } #endif /* CONFIG_CONSOLE_POLL || CONFIG_SERIAL_SH_SCI_CONSOLE */ -static void sci_init_pins(struct uart_port *port, unsigned int cflag) +static void sci_init_ctsrts_default(struct uart_port *port, bool hwflow_enabled) { struct sci_port *s = to_sci_port(port); struct plat_sci_reg *reg = sci_regmap[s->cfg->regtype] + SCSPTR; + unsigned short status; + + /* If no SCSPTR register exists then skip. Same if hardware flow + * control has been enabled, in such case SCFCR.MCE will be set + * and the SCSPTR configuration is assumed to be overridden. + */ + if (!reg->size || hwflow_enabled) + return; + + status = serial_port_in(port, SCSPTR); + status &= ~SCSPTR_CTSIO; + status |= SCSPTR_RTSIO; + serial_port_out(port, SCSPTR, status); /* Set RTS = 1 */ +} + +static void sci_init_pins(struct uart_port *port, unsigned int cflag) +{ + struct sci_port *s = to_sci_port(port); + bool hwflow_enabled = cflag & CRTSCTS; /* * Use port-specific handler if provided. @@ -522,22 +541,20 @@ static void sci_init_pins(struct uart_po return; } - /* - * For the generic path SCSPTR is necessary. Bail out if that's - * unavailable, too. + /* SCIF hardware with RTS/CTS support needs special setup below. + * + * Please note that if RTS/CTS is available for the hardware + * platform depends on the particular SCIF channel on a certain + * SoC, and how this channel has been hooked up on the actual board. + * + * If the RTS/CTS signals will be used or not depends on what user + * space requests. In case RTS/CTS is available but not requested + * by user space we still need to configure the pins somehow. */ - if (!reg->size) + if (!(s->cfg->capabilities & SCIx_HAVE_RTSCTS)) 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 */ - } + sci_init_ctsrts_default(port, hwflow_enabled); } static int sci_txfill(struct uart_port *port)
next prev parent reply other threads:[~2015-03-19 1:49 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-03-19 1:49 [PATCH v2 00/05] serial: sh-sci: Hardware flow control update V2 Magnus Damm 2015-03-19 1:49 ` Magnus Damm 2015-03-19 1:49 ` Magnus Damm [this message] 2015-03-19 1:49 ` [PATCH v2 01/05] serial: sh-sci: Break out default CTS/RTS pin setup Magnus Damm 2015-03-19 1:49 ` [PATCH v2 02/05] serial: sh-sci: Fix default RTS handling Magnus Damm 2015-03-19 1:49 ` Magnus Damm 2015-03-19 1:50 ` [PATCH v2 03/05] serial: sh-sci: Expose default CTS pin Magnus Damm 2015-03-19 1:50 ` Magnus Damm 2015-03-19 1:50 ` [PATCH v2 04/05] serial: sh-sci: Add SCIFA/SCIFB CTS/RTS pin setup Magnus Damm 2015-03-19 1:50 ` Magnus Damm 2015-03-19 1:50 ` [PATCH v2 05/05] serial: sh-sci: Expose SCIFA/SCIFB CTS pin Magnus Damm 2015-03-19 1:50 ` Magnus Damm 2015-03-19 15:57 ` [PATCH v2 00/05] serial: sh-sci: Hardware flow control update V2 Peter Hurley 2015-03-19 15:57 ` Peter Hurley
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20150319014943.14235.12896.sendpatchset@little-apple \ --to=magnus.damm@gmail.com \ --cc=geert@glider.be \ --cc=gregkh@linuxfoundation.org \ --cc=jslaby@suse.cz \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-serial@vger.kernel.org \ --cc=linux-sh@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.