Commit 9ab4f88b authored by Haavard Skinnemoen's avatar Haavard Skinnemoen Committed by Linus Torvalds

[PATCH] serial: Rename PORT_AT91 -> PORT_ATMEL

The at91_serial driver can be used with both AT32 and AT91 devices
from Atmel and has therefore been renamed atmel_serial. The only
thing left is to rename PORT_AT91 PORT_ATMEL.
Signed-off-by: default avatarHaavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: default avatarAndrew Victor <andrew@sanpeople.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7192f92c
......@@ -581,7 +581,7 @@ static void atmel_set_termios(struct uart_port *port, struct termios * termios,
*/
static const char *atmel_type(struct uart_port *port)
{
return (port->type == PORT_AT91) ? "ATMEL_SERIAL" : NULL;
return (port->type == PORT_ATMEL) ? "ATMEL_SERIAL" : NULL;
}
/*
......@@ -628,7 +628,7 @@ static int atmel_request_port(struct uart_port *port)
static void atmel_config_port(struct uart_port *port, int flags)
{
if (flags & UART_CONFIG_TYPE) {
port->type = PORT_AT91;
port->type = PORT_ATMEL;
atmel_request_port(port);
}
}
......@@ -639,7 +639,7 @@ static void atmel_config_port(struct uart_port *port, int flags)
static int atmel_verify_port(struct uart_port *port, struct serial_struct *ser)
{
int ret = 0;
if (ser->type != PORT_UNKNOWN && ser->type != PORT_AT91)
if (ser->type != PORT_UNKNOWN && ser->type != PORT_ATMEL)
ret = -EINVAL;
if (port->irq != ser->irq)
ret = -EINVAL;
......
......@@ -67,8 +67,8 @@
/* Parisc type numbers. */
#define PORT_MUX 48
/* Atmel AT91xxx SoC */
#define PORT_AT91 49
/* Atmel AT91 / AT32 SoC */
#define PORT_ATMEL 49
/* Macintosh Zilog type numbers */
#define PORT_MAC_ZILOG 50 /* m68k : not yet implemented */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment