xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MIPS: Loongson: Cleanup the serial port support

Browse Source 
To share the same kernel image amon different machines we have added the
machtype command line support.

In the old serial port implementation the UART base address is hardcoded as
a macro in machine.h which breaks with machtype, so change that to discover
the address dynamically.  Also move the initialization of the UART base
address to uart_base.c to avoid remapping twice for early_printk.c and
serial.c.

Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/581/
Patchwork: http://patchwork.linux-mips.org/patch/682/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Wu Zhangjin
2009-11-06 18:35:34 +08:00
committed by Ralf Baechle
parent 04cfb90a92
commit a3ed495190
7 changed files with 60 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
arch/mips/loongson/common/serial.c
View File

@@ -23,7 +23,6 @@
{ \
.irq = int, \
.uartclk = 1843200, \
.iobase = (LOONGSON_UART_BASE - LOONGSON_PCIIO_BASE),\
.iotype = UPIO_PORT, \
.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, \
.regshift = 0, \
@@ -52,20 +51,20 @@ static struct plat_serial8250_port uart8250_data[][2] = {
static struct platform_device uart8250_device = {
.name = "serial8250",
.id = PLAT8250_DEV_PLATFORM,
.dev = {
.platform_data = uart8250_data[LOONGSON_MACHTYPE],
},
};
static int __init serial_init(void)
{
if (uart8250_data[LOONGSON_MACHTYPE][0].iotype == UPIO_MEM)
uart8250_data[LOONGSON_MACHTYPE][0].membase =
ioremap_nocache(LOONGSON_UART_BASE, 8);
if (uart8250_data[mips_machtype][0].iotype == UPIO_MEM)
uart8250_data[mips_machtype][0].membase =
(void __iomem *)_loongson_uart_base;
else if (uart8250_data[mips_machtype][0].iotype == UPIO_PORT)
uart8250_data[mips_machtype][0].iobase =
uart8250_base[mips_machtype] - LOONGSON_PCIIO_BASE;
platform_device_register(&uart8250_device);
uart8250_device.dev.platform_data = uart8250_data[mips_machtype];
return 0;
return platform_device_register(&uart8250_device);
}
device_initcall(serial_init);