]> err.no Git - linux-2.6/commitdiff
[MIPS] Cobalt: Fix UART I/O type
authorYoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Fri, 9 Feb 2007 03:16:24 +0000 (12:16 +0900)
committerRalf Baechle <ralf@linux-mips.org>
Tue, 20 Feb 2007 01:26:42 +0000 (01:26 +0000)
The Cobalt UART is actually connected to memory resource area.

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

index a4b69b543bd903984433089474d3557e983bb218..415ff8710b553d3e76ea3f0589d70da63cedbb67 100644 (file)
@@ -130,7 +130,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 */
+       /* I/O port resource must include LCD/buttons */
        ioport_resource.end = 0x0fffffff;
 
        /* request I/O space for devices used on all i[345]86 PCs */
@@ -149,24 +149,24 @@ void __init plat_mem_setup(void)
        register_pci_controller(&cobalt_pci_controller);
 #endif
 
-#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
+       }
 }
 
 /*