From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 06 Sep 2007 16:33:39 +0100 (BST) Received: from an-out-0708.google.com ([209.85.132.240]:28291 "EHLO an-out-0708.google.com") by ftp.linux-mips.org with ESMTP id S20025788AbXIFPda (ORCPT ); Thu, 6 Sep 2007 16:33:30 +0100 Received: by an-out-0708.google.com with SMTP id d26so30134and for ; Thu, 06 Sep 2007 08:33:10 -0700 (PDT) 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=CuQmHuLVYdAWyaUx57hIAbhYNWAX/mFZOccEVe9NN3hq74yhrMEI9O6KI2W8NG1dEChkeaoNiAruMinZkIFvwd9PW1pSFgls5IhPUsNyyRYf4NbkCkriDpqCjvY8LJutLCMBfFjyHxH7rQS3lfzlIoTa/9SXKV4Yx6m+40KcDwM= 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=XczDLLrkBpNeVdcDw4wHNMrhsMZFakh4DNS/s9aIaZjrJxMTEs2T0+IOTOw8LPks2xr0pi3zaj2luETaDTJZ6PuCRBiauqNJUwlXin3NKzOWuTgY8hIWyDEoUuOeZzeBwuT/rzUYyWLJ82A17AlBcUYBVmJaZwnb4A+uRI1b9Jg= Received: by 10.100.198.18 with SMTP id v18mr680778anf.1189092790458; Thu, 06 Sep 2007 08:33:10 -0700 (PDT) Received: from raver.cocorico ( [87.7.34.46]) by mx.google.com with ESMTPS id i17sm7765524wxd.2007.09.06.08.33.06 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 06 Sep 2007 08:33:09 -0700 (PDT) Received: by 10.82.154.20 with SMTP id b20cs876037bue; Wed, 22 Aug 2007 01:11:04 -0700 (PDT) Received: by 10.82.112.3 with SMTP id k3mr943124buc.1187770261340; Wed, 22 Aug 2007 01:11:01 -0700 (PDT) Received: from smtp1.int-evry.fr (smtp1.int-evry.fr [157.159.10.44]) by mx.google.com with ESMTP id j9si1357887mue.2007.08.22.01.10.56; Wed, 22 Aug 2007 01:11:01 -0700 (PDT) Received-SPF: neutral (google.com: 157.159.10.44 is neither permitted nor denied by best guess record for domain of florian.fainelli@telecomint.eu) client-ip=157.159.10.44; Received: from smtp-ext.int-evry.fr (smtp-ext.int-evry.fr [157.159.11.17]) by smtp1.int-evry.fr (Postfix) with ESMTP id 122398E84F0; Wed, 22 Aug 2007 10:10:48 +0200 (CEST) Received: from ibook.lan (mla78-1-82-240-16-241.fbx.proxad.net [82.240.16.241]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-ext.int-evry.fr (Postfix) with ESMTP id 73CFED0E336; Wed, 22 Aug 2007 10:10:47 +0200 (CEST) From: Matteo Croce To: linux-mips@linux-mips.org Subject: [PATCH][MIPS][6/7] AR7: serial Date: Thu, 6 Sep 2007 17:33:04 +0200 User-Agent: KMail/1.9.7 References: <200708201704.11529.technoboy85@gmail.com> In-Reply-To: <200708201704.11529.technoboy85@gmail.com> MIME-Version: 1.0 Message-Id: <200709061733.04978.technoboy85@gmail.com> X-int-MailScanner-Information: Please contact the ISP for more information X-int-MailScanner: Found to be clean X-int-MailScanner-SpamCheck: n'est pas un polluriel (inscrit sur la liste blanche), SpamAssassin (pas en cache, score=-1.467, requis 4.01, autolearn=not spam, AWL 1.00, BAYES_00 -2.60, FORGED_RCVD_HELO 0.14) X-int-MailScanner-From: florian.fainelli@telecomint.eu Content-Disposition: inline Cc: Florian Fainelli , Felix Fietkau , Nicolas Thill , linux-serial@vger.kernel.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 16406 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: technoboy85@gmail.com Precedence: bulk X-list: linux-mips Serial support, should not broke other archs Signed-off-by: Matteo Croce Signed-off-by: Florian Fainelli Signed-off-by: Felix Fietkau Signed-off-by: Nicolas Thill 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 */ /*