summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJonas Danielsson <jonas@orbital-systems.com>2018-01-29 12:39:15 +0100
committerSasha Levin <alexander.levin@microsoft.com>2018-03-20 23:49:53 -0400
commitc3f500c453cca31080d5f95666b72d0656e58d0b (patch)
tree26f5b238e71b57a4b1eecea5ff58816bcd5556cb /drivers
parentcbd081ae81bd92e7fe9d0f60c4752e781b43c14a (diff)
tty/serial: atmel: add new version check for usart
[ Upstream commit fd63a8903a2c40425a9811c3371dd4d0f42c0ad3 ] 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> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Diffstat (limited to 'drivers')
-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 1f45a0302b7c..839ba41b6232 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -1687,6 +1687,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;