diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:02:14 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:02:14 +0200 |
commit | ebf9022f2eee564fc4b0e4b37a8267319923d808 (patch) | |
tree | 407715e96a34f57b194198c24099cd7b627ae714 /drivers/serial | |
parent | a293dc2753433f8052f9471b2d0cc19f01c50739 (diff) | |
parent | 7359e2852249758f6fb12dae9a0d57a197b7a769 (diff) | |
download | barebox-ebf9022f2eee564fc4b0e4b37a8267319923d808.tar.gz barebox-ebf9022f2eee564fc4b0e4b37a8267319923d808.tar.xz |
Merge branch 'for-next/rs485'
Conflicts:
common/console_common.c
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/atmel.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/drivers/serial/atmel.c b/drivers/serial/atmel.c index 8392e78ce3..c2a5d33b1b 100644 --- a/drivers/serial/atmel.c +++ b/drivers/serial/atmel.c @@ -362,6 +362,32 @@ static int atmel_serial_setbaudrate(struct console_device *cdev, int baudrate) return 0; } +static int atmel_serial_set_mode(struct console_device *cdev, enum console_mode mode) +{ + struct atmel_uart_port *uart = to_atmel_uart_port(cdev); + u32 mr; + u8 m; + + mr = readl(uart->base + USART3_MR); + mr &= ~0xf; + + switch (mode) { + case CONSOLE_MODE_NORMAL: + m = USART3_USART_MODE_NORMAL; + break; + case CONSOLE_MODE_RS485: + m = USART3_USART_MODE_RS485; + break; + default: + return -EINVAL; + } + + mr |= USART3_BF(USART_MODE, m); + writel(mr, uart->base + USART3_MR); + + return 0; +} + /* * Initialise the serial port with the given baudrate. The settings * are always 8 data bits, no parity, 1 stop bit, no start bits. @@ -401,6 +427,7 @@ static int atmel_serial_probe(struct device_d *dev) cdev->putc = atmel_serial_putc; cdev->getc = atmel_serial_getc; cdev->setbrg = atmel_serial_setbaudrate; + cdev->set_mode = atmel_serial_set_mode; atmel_serial_init_port(cdev); |