diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-11-24 20:18:32 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-11-24 20:18:32 +0900 |
| commit | cdf7c42fece7c641fcb85cfbf190fdc2a95d19ac (patch) | |
| tree | 1a45105e180e962d909df035f67e7188eb0cb4d1 /drivers/tty | |
| parent | d39ec6ce34f130d582880d1f3cbe2b38e723cafe (diff) | |
| download | linux-3.10-cdf7c42fece7c641fcb85cfbf190fdc2a95d19ac.tar.gz linux-3.10-cdf7c42fece7c641fcb85cfbf190fdc2a95d19ac.tar.bz2 linux-3.10-cdf7c42fece7c641fcb85cfbf190fdc2a95d19ac.zip | |
serial: sh-sci: Fix up modem control handling.
At the moment things like CTS/RTS are reported for all ports, while the
vast majority of them do not implement support at all (and others
implement support entirely in hardware). Fix up the ->get_mctrl()
reporting to simply assert DSR/CAR as other drivers without control
lines do.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/sh-sci.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index cd1379235f1..680d34af71f 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -1106,19 +1106,26 @@ static unsigned int sci_tx_empty(struct uart_port *port) return (status & SCxSR_TEND(port)) && !in_tx_fifo ? TIOCSER_TEMT : 0; } +/* + * Modem control is a bit of a mixed bag for SCI(F) ports. Generally + * CTS/RTS is supported in hardware by at least one port and controlled + * via SCSPTR (SCxPCR for SCIFA/B parts), or external pins (presently + * handled via the ->init_pins() op, which is a bit of a one-way street, + * lacking any ability to defer pin control -- this will later be + * converted over to the GPIO framework). + */ static void sci_set_mctrl(struct uart_port *port, unsigned int mctrl) { - /* This routine is used for seting signals of: DTR, DCD, CTS/RTS */ - /* We use SCIF's hardware for CTS/RTS, so don't need any for that. */ - /* If you have signals for DTR and DCD, please implement here. */ + /* Nothing to do here. */ } static unsigned int sci_get_mctrl(struct uart_port *port) { - /* This routine is used for getting signals of: DTR, DCD, DSR, RI, - and CTS/RTS */ - - return TIOCM_DTR | TIOCM_RTS | TIOCM_CTS | TIOCM_DSR; + /* + * CTS/RTS is handled in hardware when supported, while nothing + * else is wired up. Keep it simple and simply assert DSR/CAR. + */ + return TIOCM_DSR | TIOCM_CAR; } #ifdef CONFIG_SERIAL_SH_SCI_DMA |