From: Huacai Chen <chenhuacai@gmail.com>
To: Ralf Baechle <ralf@linux-mips.org>
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>
Subject: [PATCH V3 08/16] MIPS: Loongson 3: Add serial port support.
Date: Fri, 22 Jun 2012 11:01:05 +0800 [thread overview]
Message-ID: <1340334073-17804-9-git-send-email-chenhc@lemote.com> (raw)
In-Reply-To: <1340334073-17804-1-git-send-email-chenhc@lemote.com>
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>
Reviewed-by: Arnaud Patard <arnaud.patard@rtp-net.org>
---
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
next prev parent reply other threads:[~2012-06-22 3:04 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-22 3:00 [PATCH V3 00/16] MIPS: Add Loongson-3 based machines support Huacai Chen
2012-06-22 3:00 ` [PATCH V3 01/16] MIPS: Loongson: Add basic Loongson-3 definition Huacai Chen
2012-06-22 3:00 ` [PATCH V3 02/16] MIPS: Loongson: Add basic Loongson-3 CPU support Huacai Chen
2012-06-22 3:01 ` [PATCH V3 03/16] MIPS: Loongson 3: Add Lemote-3A machtypes definition Huacai Chen
2012-06-22 3:01 ` [PATCH V3 04/16] MIPS: Loongson: Make Loongson-3 to use BCD format for RTC Huacai Chen
2012-06-22 3:01 ` [PATCH V3 05/16] MIPS: Loongson: Add UEFI-like firmware interface support Huacai Chen
2012-06-22 3:01 ` [PATCH V3 06/16] MIPS: Loongson 3: Add HT-linked PCI support Huacai Chen
2012-06-22 3:01 ` [PATCH V3 07/16] MIPS: Loongson 3: Add IRQ init and dispatch support Huacai Chen
2012-06-22 3:01 ` Huacai Chen [this message]
2012-06-22 3:01 ` [PATCH V3 09/16] MIPS: Loongson: Add swiotlb to support big memory (>4GB) Huacai Chen
2012-06-22 3:01 ` [PATCH V3 10/16] MIPS: Loongson: Add Loongson-3 Kconfig options Huacai Chen
2012-06-22 3:01 ` [PATCH V3 11/16] drm/radeon: Make radeon card usable for Loongson Huacai Chen
2012-06-22 5:25 ` Lucas Stach
2012-06-22 5:59 ` Huacai Chen
2012-06-22 7:44 ` Christian König
2012-08-02 6:30 ` Huacai Chen
2012-06-22 9:34 ` Huacai Chen
2012-06-22 9:39 ` Arnaud Patard
2012-06-22 10:55 ` Huacai Chen
2012-06-22 11:11 ` Ralf Baechle
2012-06-23 0:46 ` Huacai Chen
2012-06-22 11:06 ` Ralf Baechle
2012-06-22 3:01 ` [PATCH V3 12/16] ALSA: HDA: Make hda sound " Huacai Chen
2012-06-22 3:01 ` [PATCH V3 13/16] MIPS: Loongson 3: Add Loongson-3 SMP support Huacai Chen
2012-06-22 3:01 ` [PATCH V3 14/16] MIPS: Loongson 3: Add CPU hotplug support Huacai Chen
2012-06-22 3:01 ` [PATCH V3 15/16] MIPS: Fix poweroff failure when HOTPLUG_CPU configured Huacai Chen
2012-06-22 3:01 ` [PATCH V3 16/16] MIPS: Loongson: Add a Loongson-3 default config file Huacai Chen
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=1340334073-17804-9-git-send-email-chenhc@lemote.com \
--to=chenhuacai@gmail.com \
--cc=chenhc@lemote.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
--cc=taohl@lemote.com \
--cc=wuzhangjin@gmail.com \
--cc=yanh@lemote.com \
--cc=zhangfx@lemote.com \
/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