diff mbox

[2/2] serial: atmel: add support for new UART version

Message ID 93f5f783fd232d9dfe99e7d6f1fdc6c92adb7c46.1453743308.git.nicolas.ferre@atmel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Nicolas Ferre Jan. 25, 2016, 5:38 p.m. UTC
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 <nicolas.ferre@atmel.com>
Reported-by: David Mosberger <davidm@egauge.net>
---
 drivers/tty/serial/atmel_serial.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

kernel test robot Jan. 25, 2016, 6:34 p.m. UTC | #1
Hi Nicolas,

[auto build test ERROR on usb/usb-testing]
[also build test ERROR on v4.5-rc1 next-20160125]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]

url:    https://github.com/0day-ci/linux/commits/Nicolas-Ferre/serial-atmel-trivial-clean-the-IP-version-decoding-code/20160126-014116
base:   https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-testing
config: i386-allmodconfig (attached as .config)
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

All errors (new ones prefixed by >>):

   drivers/tty/serial/atmel_serial.c: In function 'atmel_get_ip_name':
>> drivers/tty/serial/atmel_serial.c:1717:2: error: 'new_uart' undeclared (first use in this function)
     new_uart = 0x55415254; /* UART */
     ^
   drivers/tty/serial/atmel_serial.c:1717:2: note: each undeclared identifier is reported only once for each function it appears in

vim +/new_uart +1717 drivers/tty/serial/atmel_serial.c

  1711		int name = atmel_uart_readl(port, ATMEL_US_NAME);
  1712		u32 version;
  1713		u32 usart, dbgu_uart;
  1714		/* ASCII decoding for IP version */
  1715		usart = 0x55534152;	/* USAR(T) */
  1716		dbgu_uart = 0x44424755;	/* DBGU */
> 1717		new_uart = 0x55415254;	/* UART */
  1718	
  1719		atmel_port->has_hw_timer = false;
  1720	

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
Nicolas Ferre Jan. 26, 2016, 10:25 a.m. UTC | #2
Le 25/01/2016 19:34, kbuild test robot a écrit :
> Hi Nicolas,
> 
> [auto build test ERROR on usb/usb-testing]
> [also build test ERROR on v4.5-rc1 next-20160125]
> [if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
> 
> url:    https://github.com/0day-ci/linux/commits/Nicolas-Ferre/serial-atmel-trivial-clean-the-IP-version-decoding-code/20160126-014116
> base:   https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-testing
> config: i386-allmodconfig (attached as .config)
> reproduce:
>         # save the attached .config to linux build tree
>         make ARCH=i386 
> 
> All errors (new ones prefixed by >>):
> 
>    drivers/tty/serial/atmel_serial.c: In function 'atmel_get_ip_name':
>>> drivers/tty/serial/atmel_serial.c:1717:2: error: 'new_uart' undeclared (first use in this function)

Sorry for this dumb error and the associated noise!

I send a v2 immediately.

>      new_uart = 0x55415254; /* UART */
>      ^
>    drivers/tty/serial/atmel_serial.c:1717:2: note: each undeclared identifier is reported only once for each function it appears in
> 
> vim +/new_uart +1717 drivers/tty/serial/atmel_serial.c
> 
>   1711		int name = atmel_uart_readl(port, ATMEL_US_NAME);
>   1712		u32 version;
>   1713		u32 usart, dbgu_uart;
>   1714		/* ASCII decoding for IP version */
>   1715		usart = 0x55534152;	/* USAR(T) */
>   1716		dbgu_uart = 0x44424755;	/* DBGU */
>> 1717		new_uart = 0x55415254;	/* UART */
>   1718	
>   1719		atmel_port->has_hw_timer = false;
>   1720	
> 
> ---
> 0-DAY kernel test infrastructure                Open Source Technology Center
> https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
>
diff mbox

Patch

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");