From 9ab4f88b7ffdf338773e7755f923bc6b9e079834 Mon Sep 17 00:00:00 2001 From: Haavard Skinnemoen Date: Wed, 4 Oct 2006 16:02:06 +0200 Subject: [PATCH] [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: Haavard Skinnemoen Acked-by: Andrew Victor Signed-off-by: Linus Torvalds --- drivers/serial/atmel_serial.c | 6 +++--- include/linux/serial_core.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c index 7397d5df6d9f..2c5b72ccc4be 100644 --- a/drivers/serial/atmel_serial.c +++ b/drivers/serial/atmel_serial.c @@ -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; diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index de2e68159d96..b661c19f3f72 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -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 */ -- 2.20.1