diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-20 04:38:33 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-20 04:38:33 +0300 |
| commit | 1ca949299260aa49eeba34ff912e2321c8b1f647 (patch) | |
| tree | bb23ca6055b30a43c6c6c51c869c66f23180bb48 /arch/mips/cobalt | |
| parent | c9ce228306fda4448f5f495b4f36c07956f45acd (diff) | |
| parent | 0cfd5267476ce8051c4447988d2b0377d09188e8 (diff) | |
| download | linux-1ca949299260aa49eeba34ff912e2321c8b1f647.tar.xz | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Cobalt: Fix UART I/O type
[MIPS] Fixup copy_from_user_inatomic
[MIPS] Fix struct sigcontext for N32 userland
[MIPS] Make some __setup functions static
[MIPS] Declare highstart_pfn, highend_pfn only if CONFIG_HIGHMEM=y
[MIPS] Allow selection of KGDB only on platforms where it's supported.
Diffstat (limited to 'arch/mips/cobalt')
| -rw-r--r-- | arch/mips/cobalt/setup.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c index a4b69b543bd9..415ff8710b55 100644 --- a/arch/mips/cobalt/setup.c +++ b/arch/mips/cobalt/setup.c @@ -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 + } } /* |