2 files changed, 11 insertions, 4 deletions

diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index a182def7007d..3892666b5fbd 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -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");
diff --git a/include/linux/serial.h b/include/linux/serial.h
index c3b45add494d..ef914061511e 100644
--- a/include/linux/serial.h
+++ b/include/linux/serial.h
@@ -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 .. */
 };