From 21a61bc1b23da571114c3328f954e011af5a4eed Mon Sep 17 00:00:00 2001 From: Claudio Scordino Date: Thu, 13 Jan 2011 15:45:39 -0800 Subject: [PATCH] --- yaml --- r: 230695 b: refs/heads/master c: 5dfbd1d734ef5415bc47b034df7433ba21e40e7b h: refs/heads/master i: 230693: 03551bbdef24059ecebaec33533c9e1417743e1f 230691: b8533c9ab3eb2848652e0ac2429a7360c756eaa7 230687: c5f6ec42bd062c4d8329b90befcc32fdf97b2c2d v: v3 --- [refs] | 2 +- trunk/drivers/serial/atmel_serial.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 69627c822494..f15b0f1acf67 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c9ae009b298753a3baf71298d676a68b5a10c8f +refs/heads/master: 5dfbd1d734ef5415bc47b034df7433ba21e40e7b diff --git a/trunk/drivers/serial/atmel_serial.c b/trunk/drivers/serial/atmel_serial.c index 3892666b5fbd..2a1d52fb4936 100644 --- a/trunk/drivers/serial/atmel_serial.c +++ b/trunk/drivers/serial/atmel_serial.c @@ -1732,6 +1732,11 @@ static int __devinit atmel_serial_probe(struct platform_device *pdev) device_init_wakeup(&pdev->dev, 1); platform_set_drvdata(pdev, port); + if (port->rs485.flags & SER_RS485_ENABLED) { + UART_PUT_MR(&port->uart, ATMEL_US_USMODE_NORMAL); + UART_PUT_CR(&port->uart, ATMEL_US_RTSEN); + } + return 0; err_add_port: