From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964827AbcAYRh6 (ORCPT ); Mon, 25 Jan 2016 12:37:58 -0500 Received: from eusmtp01.atmel.com ([212.144.249.243]:27284 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964806AbcAYRh4 (ORCPT ); Mon, 25 Jan 2016 12:37:56 -0500 From: Nicolas Ferre To: Greg Kroah-Hartman , CC: , , , , Nicolas Ferre Subject: [PATCH 2/2] serial: atmel: add support for new UART version Date: Mon, 25 Jan 2016 18:38:02 +0100 Message-ID: <93f5f783fd232d9dfe99e7d6f1fdc6c92adb7c46.1453743308.git.nicolas.ferre@atmel.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <198abfa682d5a39758599d34d1c5b9fd2858cedc.1453743308.git.nicolas.ferre@atmel.com> References: <198abfa682d5a39758599d34d1c5b9fd2858cedc.1453743308.git.nicolas.ferre@atmel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Starting with sama5d2, the new UART revision has an hardware timer. So, add it to the IP detection code and set the "has_hw_timer" property for it. Signed-off-by: Nicolas Ferre Reported-by: David Mosberger --- drivers/tty/serial/atmel_serial.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index de5d32c31179..fab135824679 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -1714,11 +1714,12 @@ static void atmel_get_ip_name(struct uart_port *port) /* ASCII decoding for IP version */ usart = 0x55534152; /* USAR(T) */ dbgu_uart = 0x44424755; /* DBGU */ + new_uart = 0x55415254; /* UART */ atmel_port->has_hw_timer = false; - if (name == usart) { - dev_dbg(port->dev, "Usart with hw timer\n"); + if (name == usart || name == new_uart) { + dev_dbg(port->dev, "Usart or uart with hw timer\n"); atmel_port->has_hw_timer = true; } else if (name == dbgu_uart) { dev_dbg(port->dev, "Dbgu or uart without hw timer\n"); -- 2.1.3