From: Haavard Skinnemoen <hskinnemoen@atmel.com>
To: Andrew Victor <andrew@sanpeople.com>
Cc: Russell King <rmk+lkml@arm.linux.org.uk>,
linux-kernel@vger.kernel.org, hskinnemoen@atmel.com
Subject: [PATCH 7/8] serial: Rename PORT_AT91 -> PORT_ATMEL
Date: Wed, 27 Sep 2006 18:58:04 +0200 [thread overview]
Message-ID: <1159376285621-git-send-email-hskinnemoen@atmel.com> (raw)
In-Reply-To: <11593762851494-git-send-email-hskinnemoen@atmel.com>
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 <hskinnemoen@atmel.com>
---
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 9cfa63d..420921d 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -581,7 +581,7 @@ static void atmel_set_termios(struct uar
*/
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 uar
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 uar
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 86501a3..e5c44aa 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -67,8 +67,8 @@ #define PORT_DZ 47
/* 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 */
--
1.4.1.1
next prev parent reply other threads:[~2006-09-27 17:00 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-27 16:57 [PATCH 0/8] Rename at91_serial driver as atmel_serial Haavard Skinnemoen
2006-09-27 16:57 ` [PATCH 1/8] at91_serial -> atmel_serial: at91rm9200_usart.h Haavard Skinnemoen
2006-09-27 16:57 ` [PATCH 2/8] at91_serial -> atmel_serial: at91_serial.c Haavard Skinnemoen
2006-09-27 16:58 ` [PATCH 3/8] at91_serial -> atmel_serial: Kconfig symbols Haavard Skinnemoen
2006-09-27 16:58 ` [PATCH 4/8] at91_serial -> atmel_serial: Platform device name Haavard Skinnemoen
2006-09-27 16:58 ` [PATCH 5/8] at91_serial -> atmel_serial: Public definitions Haavard Skinnemoen
2006-09-27 16:58 ` [PATCH 6/8] at91_serial -> atmel_serial: Internal names Haavard Skinnemoen
2006-09-27 16:58 ` Haavard Skinnemoen [this message]
2006-09-27 16:58 ` [PATCH 8/8] atmel_serial: Kill at91_register_uart_fns Haavard Skinnemoen
2006-09-28 9:21 ` Andrew Victor
2006-09-28 9:38 ` Haavard Skinnemoen
2006-09-28 11:14 ` Andrew Victor
2006-09-28 11:51 ` Haavard Skinnemoen
2006-09-28 11:56 ` Andrew Victor
2006-09-28 17:02 ` Sam Ravnborg
2006-09-28 9:03 ` [PATCH 7/8] serial: Rename PORT_AT91 -> PORT_ATMEL Andrew Victor
2006-09-28 9:02 ` [PATCH 6/8] at91_serial -> atmel_serial: Internal names Andrew Victor
2006-09-28 8:54 ` [PATCH 5/8] at91_serial -> atmel_serial: Public definitions Andrew Victor
2006-09-28 9:24 ` Haavard Skinnemoen
2006-09-28 9:22 ` Andrew Victor
2006-09-28 8:35 ` [PATCH 4/8] at91_serial -> atmel_serial: Platform device name Andrew Victor
2006-09-28 12:55 ` Haavard Skinnemoen
2006-09-28 8:34 ` [PATCH 3/8] at91_serial -> atmel_serial: Kconfig symbols Andrew Victor
2006-09-28 8:54 ` Haavard Skinnemoen
2006-09-28 8:50 ` Andrew Victor
2006-09-28 8:22 ` [PATCH 2/8] at91_serial -> atmel_serial: at91_serial.c Andrew Victor
2006-09-28 8:20 ` [PATCH 1/8] at91_serial -> atmel_serial: at91rm9200_usart.h Andrew Victor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1159376285621-git-send-email-hskinnemoen@atmel.com \
--to=hskinnemoen@atmel.com \
--cc=andrew@sanpeople.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rmk+lkml@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®