linux-mips
[Top] [All Lists]

[PATCH][MIPS][6/7] AR7: serial

To: linux-mips@linux-mips.org
Subject: [PATCH][MIPS][6/7] AR7: serial
From: Matteo Croce <technoboy85@gmail.com>
Date: Sat, 8 Sep 2007 02:22:05 +0200
Cc: Florian Fainelli <florian@openwrt.org>, Felix Fietkau <nbd@openwrt.org>, Nicolas Thill <nico@openwrt.org>, linux-serial@vger.kernel.org, openwrt-devel@lists.openwrt.org, Andrew Morton <akpm@linux-foundation.org>
Delivered-to: technoboy85@gmail.com
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:x-spam-checker-version:x-spam-status:delivered-to:received:received:received:received-spf:received:received:from:to:subject:date:user-agent:references:in-reply-to:mime-version:message-id:x-int-mailscanner-information:x-int-mailscanner:x-int-mailscanner-spamcheck:x-int-mailscanner-from:content-disposition:cc:content-type:content-transfer-encoding; bh=4YVKhsopTqM5vxPx1qWT0Olu2LSIi+rkUu+TRqdLoqM=; b=phonkzh2+XJ1BMbXH7D+Pne4JZH3N9xCxSADemtrvZCSgUwhrXBKbt/9r//5LwfGysD8Bk2uywj+pDmTDmfL9cQcEXuw48gJUlFOQRWbGF5EaVU2jgUNDl/TVal3gTkxZfQyq7iYcBOPxdb2Nx2+Gxn4PGk2QTHQ2dFfFdtRkyg=
Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:x-spam-checker-version:x-spam-status:delivered-to:received-spf:from:to:subject:date:user-agent:references:in-reply-to:mime-version:message-id:x-int-mailscanner-information:x-int-mailscanner:x-int-mailscanner-spamcheck:x-int-mailscanner-from:content-disposition:cc:content-type:content-transfer-encoding; b=FIvGWsnRUhWBrL1Z/tt9i3zhQicqmDXqKDJVvfVH1e1TFxqcr3MVhI0/Mi24MM22hb/QvpJepcidFteu71jo/rMJhY9PCAbJAVQ2Unq7K+MszFl/UzXQydtC84Jx10BpbCSQ3HGuIlzmODK5OoRm1/QUZ40ZAVzaI6cpLbPb+uQ=
In-reply-to: <200709080143.12345.technoboy85@gmail.com>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <200709080143.12345.technoboy85@gmail.com>
Sender: linux-mips-bounce@linux-mips.org
User-agent: KMail/1.9.7
Serial support, should not broke other archs

Signed-off-by: Matteo Croce <technoboy85@gmail.com>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Nicolas Thill <nico@openwrt.org>

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index f94109c..94253b7 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -267,6 +267,13 @@ static const struct serial8250_config uart_config[] = {
                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
                .flags          = UART_CAP_FIFO,
        },
+       [PORT_AR7] = {
+               .name           = "TI-AR7",
+               .fifo_size      = 16,
+               .tx_loadsz      = 16,
+               .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_00,
+               .flags          = UART_CAP_FIFO | UART_CAP_AFE,
+       },
 };
 
 #if defined (CONFIG_SERIAL_8250_AU1X00)
@@ -2453,7 +2460,11 @@ static void serial8250_console_putchar(struct uart_port 
*port, int ch)
 {
        struct uart_8250_port *up = (struct uart_8250_port *)port;
 
+#ifdef CONFIG_AR7
+       wait_for_xmitr(up, BOTH_EMPTY);
+#else
        wait_for_xmitr(up, UART_LSR_THRE);
+#endif
        serial_out(up, UART_TX, ch);
 }
 
diff --git a/include/linux/serialP.h b/include/linux/serialP.h
index e811a61..ba5734a 100644
--- a/include/linux/serialP.h
+++ b/include/linux/serialP.h
@@ -135,6 +135,9 @@ struct rs_multiport_struct {
  * the interrupt line _up_ instead of down, so if we register the IRQ
  * while the UART is in that state, we die in an IRQ storm. */
 #define ALPHA_KLUDGE_MCR (UART_MCR_OUT2)
+#elif defined(CONFIG_AR7)
+/* This is how it is set up by bootloader... */
+#define ALPHA_KLUDGE_MCR 
(UART_MCR_OUT2|UART_MCR_OUT1|UART_MCR_RTS|UART_MCR_DTR)
 #else
 #define ALPHA_KLUDGE_MCR 0
 #endif
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 09d17b0..8ad2c3b 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -40,6 +40,7 @@
 #define PORT_NS16550A  14
 #define PORT_XSCALE    15
 #define PORT_RM9000    16      /* PMC-Sierra RM9xxx internal UART */
+#define PORT_AR7       16
 #define PORT_MAX_8250  16      /* max port ID */
 
 /*

<Prev in Thread] Current Thread [Next in Thread>