[MIPS] WRPPMC serial support move to platform device

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/gt64120/wrppmc/Makefile b/arch/mips/gt64120/wrppmc/Makefile
index bef15c90ae15c096b06a124284db79e4edbca57b..b49d282bee8a1bbb4b31bc3719437fa2637987ec 100644 (file)
--- a/arch/mips/gt64120/wrppmc/Makefile
+++ b/arch/mips/gt64120/wrppmc/Makefile
@@ -9,6 +9,6 @@
 # Makefile for the Wind River MIPS 4KC PPMC Eval Board
 #
 
-obj-y += irq.o reset.o setup.o time.o pci.o
+obj-y += irq.o pci.o reset.o serial.o setup.o time.o
 
 EXTRA_CFLAGS += -Werror

diff --git a/arch/mips/gt64120/wrppmc/serial.c b/arch/mips/gt64120/wrppmc/serial.c
new file mode 100644 (file)
index 0000000..5ec1c2f
--- /dev/null
+++ b/arch/mips/gt64120/wrppmc/serial.c
@@ -0,0 +1,80 @@
+/*
+ *  Registration of WRPPMC UART platform device.
+ *
+ *  Copyright (C) 2007  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/platform_device.h>
+#include <linux/serial_8250.h>
+
+#include <asm/gt64120.h>
+
+static struct resource wrppmc_uart_resource[] __initdata = {
+       {
+               .start  = WRPPMC_UART16550_BASE,
+               .end    = WRPPMC_UART16550_BASE + 7,
+               .flags  = IORESOURCE_MEM,
+       },
+       {
+               .start  = WRPPMC_UART16550_IRQ,
+               .end    = WRPPMC_UART16550_IRQ,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static struct plat_serial8250_port wrppmc_serial8250_port[] = {
+       {
+               .irq            = WRPPMC_UART16550_IRQ,
+               .uartclk        = WRPPMC_UART16550_CLOCK,
+               .iotype         = UPIO_MEM,
+               .flags          = UPF_IOREMAP | UPF_SKIP_TEST,
+               .mapbase        = WRPPMC_UART16550_BASE,
+       },
+       {},
+};
+
+static __init int wrppmc_uart_add(void)
+{
+       struct platform_device *pdev;
+       int retval;
+
+       pdev = platform_device_alloc("serial8250", -1);
+       if (!pdev)
+               return -ENOMEM;
+
+       pdev->id = PLAT8250_DEV_PLATFORM;
+       pdev->dev.platform_data = wrppmc_serial8250_port;
+
+       retval = platform_device_add_resources(pdev, wrppmc_uart_resource,
+                                       ARRAY_SIZE(wrppmc_uart_resource));
+       if (retval)
+               goto err_free_device;
+
+       retval = platform_device_add(pdev);
+       if (retval)
+               goto err_free_device;
+
+       return 0;
+
+err_free_device:
+       platform_device_put(pdev);
+
+       return retval;
+}
+device_initcall(wrppmc_uart_add);

diff --git a/arch/mips/gt64120/wrppmc/setup.c b/arch/mips/gt64120/wrppmc/setup.c
index f2ccf101e6d9b830100cef86d6aadd7cae10de61..51f6b7862460eca4f9d523eb038fab740733e73d 100644 (file)
--- a/arch/mips/gt64120/wrppmc/setup.c
+++ b/arch/mips/gt64120/wrppmc/setup.c
@@ -11,10 +11,6 @@
 #include <linux/init.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
-#include <linux/tty.h>
-#include <linux/serial.h>
-#include <linux/serial_core.h>
-#include <linux/serial_8250.h>
 #include <linux/pm.h>
 
 #include <asm/io.h>
@@ -98,32 +94,6 @@ void __init prom_free_prom_memory(void)
 {
 }
 
-#ifdef CONFIG_SERIAL_8250
-static void wrppmc_setup_serial(void)
-{
-       struct uart_port up;
-
-       memset(&up, 0x00, sizeof(struct uart_port));
-
-       /*
-        * A note about mapbase/membase
-        * -) mapbase is the physical address of the IO port.
-        * -) membase is an 'ioremapped' cookie.
-        */
-       up.line = 0;
-       up.type = PORT_16550;
-       up.iotype = UPIO_MEM;
-       up.mapbase = WRPPMC_UART16550_BASE;
-       up.membase = ioremap(up.mapbase, 8);
-       up.irq = WRPPMC_UART16550_IRQ;
-       up.uartclk = WRPPMC_UART16550_CLOCK;
-       up.flags = UPF_SKIP_TEST/* | UPF_BOOT_AUTOCONF */;
-       up.regshift = 0;
-
-       early_serial_setup(&up);
-}
-#endif
-
 void __init plat_mem_setup(void)
 {
        extern void wrppmc_machine_restart(char *command);
@@ -138,10 +108,6 @@ void __init plat_mem_setup(void)
         * physical address ( < KSEG0) can work via KSEG1
         */
        set_io_port_base(KSEG1);
-
-#ifdef CONFIG_SERIAL_8250
-       wrppmc_setup_serial();
-#endif
 }
 
 const char *get_system_type(void)