[PATCH 8/12] moved Cobalt serial I/O resource to memory resource

[Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>]

Hi Ralf,

This patch has moved Cobalt serial I/O resource to memory resource.
The Cobalt serial port mapped memory resource area.

Yoichi

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

diff -pruN -X mips/Documentation/dontdiff 
mips-orig/arch/mips/gt64120/cobalt/setup.c mips/arch/mips/gt64120/cobalt/setup.c
--- mips-orig/arch/mips/gt64120/cobalt/setup.c  2006-08-21 22:46:30.651155000 
+0900
+++ mips/arch/mips/gt64120/cobalt/setup.c       2006-08-21 22:31:39.043433000 
+0900
@@ -21,7 +21,6 @@
 #include <asm/irq.h>
 #include <asm/processor.h>
 #include <asm/gt64120.h>
-#include <asm/serial.h>
 
 #include <cobalt.h>
 
@@ -92,8 +91,7 @@ void __init plat_mem_setup(void)
 
         set_io_port_base(CKSEG1ADDR(GT_DEF_PCI0_IO_BASE));
 
-       /* I/O port resource must include UART and LCD/buttons */
-       ioport_resource.end = 0x0fffffff;
+       ioport_resource.end = 0xffff;
 
        /* request I/O space for devices used on all i[345]86 PCs */
        for (i = 0; i < COBALT_IO_RESOURCES; i++)
@@ -107,24 +105,24 @@ void __init plat_mem_setup(void)
 
        printk("Cobalt board ID: %d\n", cobalt_board_id);
 
-#ifdef CONFIG_SERIAL_8250
        if (cobalt_board_id > COBALT_BRD_ID_RAQ1) {
-
 #ifdef CONFIG_EARLY_PRINTK
                cobalt_early_console();
 #endif
 
+#ifdef CONFIG_SERIAL_8250
                uart.line       = 0;
                uart.type       = PORT_UNKNOWN;
                uart.uartclk    = 18432000;
                uart.irq        = COBALT_SERIAL_IRQ;
-               uart.flags      = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
-               uart.iobase     = 0xc800000;
-               uart.iotype     = UPIO_PORT;
+               uart.flags      = UPF_IOREMAP | UPF_BOOT_AUTOCONF |
+                                 UPF_SKIP_TEST;
+               uart.iotype     = UPIO_MEM;
+               uart.mapbase    = 0x1c800000;
 
                early_serial_setup(&uart);
-       }
 #endif
+       }
 }
 
 /*