Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (71 commits)
  MIPS: Lasat: Fix botched changes to sysctl code.
  RTC: rtc-cmos.c: Fix warning on MIPS
  MIPS: Cleanup random differences beween lmo and Linus' kernel.
  MIPS: No longer hardwire CONFIG_EMBEDDED to y
  MIPS: Fix and enhance built-in kernel command line
  MIPS: eXcite: Remove platform.
  MIPS: Loongson: Cleanups of serial port support
  MIPS: Lemote 2F: Suspend CS5536 MFGPT Timer
  MIPS: Excite: move iodev_remove to .devexit.text
  MIPS: Lasat: Convert to proc_fops / seq_file
  MIPS: Cleanup signal code initialization
  MIPS: Modularize COP2 handling
  MIPS: Move EARLY_PRINTK to Kconfig.debug
  MIPS: Yeeloong 2F: Cleanup reset logic using the new ec_write function
  MIPS: Yeeloong 2F: Add LID open event as the wakeup event
  MIPS: Yeeloong 2F: Add basic EC operations
  MIPS: Move several variables from .bss to .init.data
  MIPS: Tracing: Make function graph tracer work with -mmcount-ra-address
  MIPS: Tracing: Reserve $12(t0) for mcount-ra-address of gcc 4.5
  MIPS: Tracing: Make ftrace for MIPS work without -fno-omit-frame-pointer
  ...

1 files changed, 76 insertions, 0 deletions

diff --git a/arch/mips/loongson/common/serial.c b/arch/mips/loongson/common/serial.c
new file mode 100644
index 000000000000..23b66a5f88cb
--- /dev/null
+++ b/arch/mips/loongson/common/serial.c
@@ -0,0 +1,76 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2007 Ralf Baechle (ralf@linux-mips.org)
+ *
+ * Copyright (C) 2009 Lemote, Inc.
+ * Author: Yan hua (yanhua@lemote.com)
+ * Author: Wu Zhangjin (wuzj@lemote.com)
+ */
+
+#include <linux/io.h>
+#include <linux/init.h>
+#include <linux/serial_8250.h>
+
+#include <asm/bootinfo.h>
+
+#include <loongson.h>
+#include <machine.h>
+
+#define PORT(int)                       \
+{                                                               \
+        .irq            = int,                                  \
+        .uartclk        = 1843200,                              \
+        .iotype         = UPIO_PORT,                            \
+        .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,    \
+        .regshift       = 0,                                    \
+}
+
+#define PORT_M(int)                             \
+{                                                               \
+        .irq            = MIPS_CPU_IRQ_BASE + (int),            \
+        .uartclk        = 3686400,                              \
+        .iotype         = UPIO_MEM,                             \
+        .membase        = (void __iomem *)NULL,                 \
+        .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,    \
+        .regshift       = 0,                                    \
+}
+
+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_LOONGSON_END]             {},
+};
+
+static struct platform_device uart8250_device = {
+        .name = "serial8250",
+        .id = PLAT8250_DEV_PLATFORM,
+};
+
+static int __init serial_init(void)
+{
+        unsigned char iotype;
+
+        iotype = uart8250_data[mips_machtype][0].iotype;
+
+        if (UPIO_MEM == iotype)
+                uart8250_data[mips_machtype][0].membase =
+                        (void __iomem *)_loongson_uart_base;
+        else if (UPIO_PORT == iotype)
+                uart8250_data[mips_machtype][0].iobase =
+                    loongson_uart_base - LOONGSON_PCIIO_BASE;
+
+        uart8250_device.dev.platform_data = uart8250_data[mips_machtype];
+
+        return platform_device_register(&uart8250_device);
+}
+
+device_initcall(serial_init);