summaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorJonas Danielsson <jonas@orbital-systems.com>2018-01-29 14:39:15 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-03-18 13:15:44 +0300
commit6515f2dd23e3e6ab6076afb04e57efdbee74462a (patch)
tree96500b6e709f5c8512a317b8f2928bd223166816 /drivers/tty
parent7353f81f6cc4909019a729f32f2e822895aba845 (diff)
downloadlinux-6515f2dd23e3e6ab6076afb04e57efdbee74462a.tar.xz
tty/serial: atmel: add new version check for usart
commit fd63a8903a2c40425a9811c3371dd4d0f42c0ad3 upstream. On our at91sam9260 based board the usart0 and usart1 ports report their versions (ATMEL_US_VERSION) as 0x10302. This version is not included in the current checks in the driver. Signed-off-by: Jonas Danielsson <jonas@orbital-systems.com> Acked-by: Richard Genoud <richard.genoud@gmail.com> Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/atmel_serial.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index f958ccda379a..faaf50061308 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -1643,6 +1643,7 @@ static void atmel_get_ip_name(struct uart_port *port)
switch (version) {
case 0x302:
case 0x10213:
+ case 0x10302:
dev_dbg(port->dev, "This version is usart\n");
atmel_port->is_usart = true;
break;