Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b633184 authored by Claudio Scordino's avatar Claudio Scordino Committed by Greg Kroah-Hartman
Browse files

serial: general fixes in the serial_rs485 structure 



Fix several issues related to the RS485 interface:

 - It adds the flag SER_RS485_RTS_BEFORE_SEND that was missing from the
   serial_rs485 structure (even if "delay_rts_before_send" was existing)

 - It adds a further "delay_rts_after_send" field for those drivers that
   can have a delay after send (e.g., atmel_serial)

 - It fixes the usage of the structure in the atmel_serial driver (where
   "delay_rts_before_send" should be used instead of "delay_rts_after_send").

Signed-off-by: default avatarClaudio Scordino <claudio@evidence.eu.com>
Signed-off-by: default avatarBernhard Roth <br@pwrnet.de>
Cc: Philippe De Muyter <phdm@macqel.be>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 93e3d582

drivers/serial/atmel_serial.c

+8 −3
Original line number Diff line number Diff line
@@ -217,7 +217,8 @@ void atmel_config_rs485(struct uart_port *port, struct serial_rs485 *rs485conf) 
	if (rs485conf->flags & SER_RS485_ENABLED) {

		dev_dbg(port->dev, "Setting UART to RS485\n");

		atmel_port->tx_done_mask = ATMEL_US_TXEMPTY;

		UART_PUT_TTGR(port, rs485conf->delay_rts_before_send);

		if (rs485conf->flags & SER_RS485_RTS_AFTER_SEND)

			UART_PUT_TTGR(port, rs485conf->delay_rts_after_send);

		mode |= ATMEL_US_USMODE_RS485;

	} else {

		dev_dbg(port->dev, "Setting UART to RS232\n");
@@ -292,7 +293,9 @@ static void atmel_set_mctrl(struct uart_port *port, u_int mctrl) 


	if (atmel_port->rs485.flags & SER_RS485_ENABLED) {

		dev_dbg(port->dev, "Setting UART to RS485\n");

		UART_PUT_TTGR(port, atmel_port->rs485.delay_rts_before_send);

		if (atmel_port->rs485.flags & SER_RS485_RTS_AFTER_SEND)

			UART_PUT_TTGR(port,

					atmel_port->rs485.delay_rts_after_send);

		mode |= ATMEL_US_USMODE_RS485;

	} else {

		dev_dbg(port->dev, "Setting UART to RS232\n");
@@ -1211,7 +1214,9 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios, 


	if (atmel_port->rs485.flags & SER_RS485_ENABLED) {

		dev_dbg(port->dev, "Setting UART to RS485\n");

		UART_PUT_TTGR(port, atmel_port->rs485.delay_rts_before_send);

		if (atmel_port->rs485.flags & SER_RS485_RTS_AFTER_SEND)

			UART_PUT_TTGR(port,

					atmel_port->rs485.delay_rts_after_send);

		mode |= ATMEL_US_USMODE_RS485;

	} else {

		dev_dbg(port->dev, "Setting UART to RS232\n");

include/linux/serial.h

+3 −1
Original line number Diff line number Diff line
@@ -210,8 +210,10 @@ struct serial_rs485 { 
#define SER_RS485_ENABLED		(1 << 0)

#define SER_RS485_RTS_ON_SEND		(1 << 1)

#define SER_RS485_RTS_AFTER_SEND	(1 << 2)

#define SER_RS485_RTS_BEFORE_SEND	(1 << 3)

	__u32	delay_rts_before_send;	/* Milliseconds */

	__u32	padding[6];		/* Memory is cheap, new structs

	__u32	delay_rts_after_send;	/* Milliseconds */

	__u32	padding[5];		/* Memory is cheap, new structs

					   are a royal PITA .. */

};