linux-mips
[Top] [All Lists]

[PATCH V6 08/15] MIPS: Loongson 3: Add serial port support

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH V6 08/15] MIPS: Loongson 3: Add serial port support
From: Huacai Chen <chenhc@lemote.com>
Date: Fri, 17 Aug 2012 16:43:28 +0800
Cc: linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, Fuxin Zhang <zhangfx@lemote.com>, Zhangjin Wu <wuzhangjin@gmail.com>, Huacai Chen <chenhc@lemote.com>, Hongliang Tao <taohl@lemote.com>, Hua Yan <yanh@lemote.com>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=0clVjA/X/lXWLq8/eTDiFP19ZoZ3xsqKvlMs8NUC9NY=; b=RInfF8UYibb4S9YD4jkAKN/iX7en9It1T8/Cp8qMHeWcQtUmzz1H/Oqby/T7vWqZkF /m9Etd2qw0ctXdPTbNQU0k12819soe3julzI8FoSAV0/IuFhrk5INy4pKUWNr27qS5Bs 9yeRj88ES8rSsyUDKcyxdsoUx2AQFS0WodEM2b+itAg28It0bx0B4FHtB0NKPvLWCoQu w5qb2bOl+GNQRiyhMm0h+hqcJBFe8yyvBVgnwZF3HuCQHHkwy2Ly1qjmrBU61J9ChAEW 2t1k3lxjYNuxt1b47bGx7bYUsSZmhg/IqTYmd8VtA1UB2Ik1dTd8nzJQZlc/pOIkDMYX REGQ==
In-reply-to: <1345193015-3024-1-git-send-email-chenhc@lemote.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
References: <1345193015-3024-1-git-send-email-chenhc@lemote.com>
Sender: linux-mips-bounce@linux-mips.org
Loongson family machines has three types of serial port: PCI UART, LPC
UART and CPU internal UART. Loongson-2E and parts of Loongson-2F based
machines use PCI UART; most Loongson-2F based machines use LPC UART;
Loongson-2G/3A has both LPC and CPU UART but usually use CPU UART.

Port address of UARTs:
CPU UART: REG_BASE + OFFSET;
LPC UART: LIO1_BASE + OFFSET;
PCI UART: PCIIO_BASE + OFFSET.

Since LPC UART are linked in "Local Bus", both CPU UART and LPC UART
are called "CPU provided serial port".

Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
---
 arch/mips/loongson/common/serial.c    |   26 +++++++++++++++-----------
 arch/mips/loongson/common/uart_base.c |    9 ++++++++-
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/arch/mips/loongson/common/serial.c 
b/arch/mips/loongson/common/serial.c
index 7580873..59c76b5 100644
--- a/arch/mips/loongson/common/serial.c
+++ b/arch/mips/loongson/common/serial.c
@@ -19,19 +19,19 @@
 #include <loongson.h>
 #include <machine.h>
 
-#define PORT(int)                      \
+#define PORT(int, clk)                 \
 {                                                              \
        .irq            = int,                                  \
-       .uartclk        = 1843200,                              \
+       .uartclk        = clk,                                  \
        .iotype         = UPIO_PORT,                            \
        .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,    \
        .regshift       = 0,                                    \
 }
 
-#define PORT_M(int)                            \
+#define PORT_M(int, clk)                               \
 {                                                              \
        .irq            = MIPS_CPU_IRQ_BASE + (int),            \
-       .uartclk        = 3686400,                              \
+       .uartclk        = clk,                                  \
        .iotype         = UPIO_MEM,                             \
        .membase        = (void __iomem *)NULL,                 \
        .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,    \
@@ -40,13 +40,17 @@
 
 static struct plat_serial8250_port uart8250_data[][2] = {
        [MACH_LOONGSON_UNKNOWN]         {},
-       [MACH_LEMOTE_FL2E]              {PORT(4), {} },
-       [MACH_LEMOTE_FL2F]              {PORT(3), {} },
-       [MACH_LEMOTE_ML2F7]             {PORT_M(3), {} },
-       [MACH_LEMOTE_YL2F89]            {PORT_M(3), {} },
-       [MACH_DEXXON_GDIUM2F10]         {PORT_M(3), {} },
-       [MACH_LEMOTE_NAS]               {PORT_M(3), {} },
-       [MACH_LEMOTE_LL2F]              {PORT(3), {} },
+       [MACH_LEMOTE_FL2E]              {PORT(4, 1843200), {} },
+       [MACH_LEMOTE_FL2F]              {PORT(3, 1843200), {} },
+       [MACH_LEMOTE_ML2F7]             {PORT_M(3, 3686400), {} },
+       [MACH_LEMOTE_YL2F89]            {PORT_M(3, 3686400), {} },
+       [MACH_DEXXON_GDIUM2F10]         {PORT_M(3, 3686400), {} },
+       [MACH_LEMOTE_NAS]               {PORT_M(3, 3686400), {} },
+       [MACH_LEMOTE_LL2F]              {PORT(3, 1843200), {} },
+       [MACH_LEMOTE_A1004]             {PORT_M(2, 33177600), {} },
+       [MACH_LEMOTE_A1101]             {PORT_M(2, 25000000), {} },
+       [MACH_LEMOTE_A1201]             {PORT_M(2, 25000000), {} },
+       [MACH_LEMOTE_A1205]             {PORT_M(2, 25000000), {} },
        [MACH_LOONGSON_END]             {},
 };
 
diff --git a/arch/mips/loongson/common/uart_base.c 
b/arch/mips/loongson/common/uart_base.c
index d69ea54..ea8b501 100644
--- a/arch/mips/loongson/common/uart_base.c
+++ b/arch/mips/loongson/common/uart_base.c
@@ -35,9 +35,16 @@ void prom_init_loongson_uart_base(void)
        case MACH_DEXXON_GDIUM2F10:
        case MACH_LEMOTE_NAS:
        default:
-               /* The CPU provided serial port */
+               /* The CPU provided serial port (LPC) */
                loongson_uart_base = LOONGSON_LIO1_BASE + 0x3f8;
                break;
+       case MACH_LEMOTE_A1004:
+       case MACH_LEMOTE_A1101:
+       case MACH_LEMOTE_A1201:
+       case MACH_LEMOTE_A1205:
+               /* The CPU provided serial port (CPU) */
+               loongson_uart_base = LOONGSON_REG_BASE + 0x1e0;
+               break;
        }
 
        _loongson_uart_base =
-- 
1.7.7.3


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