[MIPS] Put an end to <asm/serial.h>'s long and annyoing existence

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

2 files changed, 52 insertions, 36 deletions

diff --git a/arch/mips/sgi-ip32/ip32-platform.c b/arch/mips/sgi-ip32/ip32-platform.c
index 120b15932ca..ba3697ee7ff 100644
--- a/arch/mips/sgi-ip32/ip32-platform.c
+++ b/arch/mips/sgi-ip32/ip32-platform.c
@@ -1,5 +1,53 @@
+/*
+ * 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)
+ */
+#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/serial_8250.h>
+
+#include <asm/ip32/mace.h>
+#include <asm/ip32/ip32_ints.h>
+
+/*
+ * .iobase isn't a constant (in the sense of C) so we fill it in at runtime.
+ */
+#define MACE_PORT(int)                                                  \
+{                                                                       \
+        .irq            = int,                                          \
+        .uartclk        = 1843200,                                      \
+        .iotype         = UPIO_MEM,                                     \
+        .flags          = UPF_SKIP_TEST,                                \
+        .regshift       = 8,                                            \
+}
+
+static struct plat_serial8250_port uart8250_data[] = {
+        MACE_PORT(MACEISA_SERIAL1_IRQ),
+        MACE_PORT(MACEISA_SERIAL2_IRQ),
+        { },
+};
+
+static struct platform_device uart8250_device = {
+        .name                   = "serial8250",
+        .id                     = PLAT8250_DEV_PLATFORM,
+        .dev                    = {
+                .platform_data  = uart8250_data,
+        },
+};
+
+static int __init uart8250_init(void)
+{
+        uart8250_data[0].iobase = (unsigned long) &mace->isa.serial1;
+        uart8250_data[1].iobase = (unsigned long) &mace->isa.serial1;
+
+        return platform_device_register(&uart8250_device);
+}
+
+device_initcall(uart8250_init);
 
 static __init int meth_devinit(void)
 {
@@ -18,3 +66,7 @@ static __init int meth_devinit(void)
 }
 
 device_initcall(meth_devinit);
+
+MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("8250 UART probe driver for SGI IP32 aka O2");
diff --git a/arch/mips/sgi-ip32/ip32-setup.c b/arch/mips/sgi-ip32/ip32-setup.c
index 57708fe28bd..bbba066cb40 100644
--- a/arch/mips/sgi-ip32/ip32-setup.c
+++ b/arch/mips/sgi-ip32/ip32-setup.c
@@ -62,12 +62,6 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str)
 }
 #endif
 
-#ifdef CONFIG_SERIAL_8250
-#include <linux/tty.h>
-#include <linux/serial.h>
-#include <linux/serial_core.h>
-#endif /* CONFIG_SERIAL_8250 */
-
 /* An arbitrary time; this can be decreased if reliability looks good */
 #define WAIT_MS 10
 
@@ -96,36 +90,6 @@ void __init plat_mem_setup(void)
 
         board_time_init = ip32_time_init;
 
-#ifdef CONFIG_SERIAL_8250
-        {
-                static struct uart_port o2_serial[2];
-
-                memset(o2_serial, 0, sizeof(o2_serial));
-                o2_serial[0].type       = PORT_16550A;
-                o2_serial[0].line       = 0;
-                o2_serial[0].irq        = MACEISA_SERIAL1_IRQ;
-                o2_serial[0].flags      = UPF_SKIP_TEST;
-                o2_serial[0].uartclk    = 1843200;
-                o2_serial[0].iotype     = UPIO_MEM;
-                o2_serial[0].membase    = (char *)&mace->isa.serial1;
-                o2_serial[0].fifosize   = 14;
-                /* How much to shift register offset by. Each UART register
-                 * is replicated over 256 byte space */
-                o2_serial[0].regshift   = 8;
-                o2_serial[1].type       = PORT_16550A;
-                o2_serial[1].line       = 1;
-                o2_serial[1].irq        = MACEISA_SERIAL2_IRQ;
-                o2_serial[1].flags      = UPF_SKIP_TEST;
-                o2_serial[1].uartclk    = 1843200;
-                o2_serial[1].iotype     = UPIO_MEM;
-                o2_serial[1].membase    = (char *)&mace->isa.serial2;
-                o2_serial[1].fifosize   = 14;
-                o2_serial[1].regshift   = 8;
-
-                early_serial_setup(&o2_serial[0]);
-                early_serial_setup(&o2_serial[1]);
-        }
-#endif
 #ifdef CONFIG_SGI_O2MACE_ETH
         {
                 char *mac = ArcGetEnvironmentVariable("eaddr");