diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-27 19:19:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-27 19:19:22 -0500 |
commit | f1dd6ad599732fc89f36fdd65a2c2cf3c63a8711 (patch) | |
tree | 5092207128e47cba99dc0fe373fff6a36f4cb4b8 /drivers/serial | |
parent | 8d37a371b6869920e6c40c495c68eabba1ef3909 (diff) | |
parent | e10b234b3c4e255d3300a486c4ac15b43253ac6d (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (141 commits)
MIPS: Alchemy: defconfig updates
MIPS: Alchemy: Fix Au1100 ethernet build failure
MIPS: Alchemy: Repair db1500/bosporus builds
MIPS: ARC: Cleanup unused definitions from sgialib.h
MIPS: Cobalt: convert legacy port addresses to GT-64111 bus addresses
MIPS: Alchemy: use 36bit addresses for PCMCIA resources.
MIPS: Cobalt: Fix theoretical port aliasing issue
MIPS: Use ALIGN(x, bytes) instead of __ALIGN_MASK(x, bytes - 1)
MIPS: Crazy spinlock speed test.
MIPS: Optimize spinlocks.
MIPS: Alchemy: devboard PM needs to save CPLD registers.
MIPS: PowerTV: Eliminate duplicate opcode definition macros
MIPS: Lemote 2F: Move printks out of port_access_lock.
MIPS: PNX833x: Convert IRQ controller locks to raw spinlocks.
MIPS: Octeon: Replace spinlock with raw_spinlocks in dma-octeon.c.
MIPS: Octeon: Replace rwlocks in irq_chip handlers with raw_spinlocks.
MIPS: Octeon: Convert octeon_irq_msi_lock to raw spinlock.
MIPS: Loongson: Remove pointless sample_lock from oprofile code.
MIPS: SNI: Convert sni_rm200_i8259A_lock to raw spinlock.
MIPS: i8259: Convert IRQ controller lock to raw spinlock.
...
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/8250.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index e9b15c3746fa..a81ff7bc5fa1 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c | |||
@@ -1217,12 +1217,6 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags) | |||
1217 | } | 1217 | } |
1218 | #endif | 1218 | #endif |
1219 | 1219 | ||
1220 | #ifdef CONFIG_SERIAL_8250_AU1X00 | ||
1221 | /* if access method is AU, it is a 16550 with a quirk */ | ||
1222 | if (up->port.type == PORT_16550A && up->port.iotype == UPIO_AU) | ||
1223 | up->bugs |= UART_BUG_NOMSR; | ||
1224 | #endif | ||
1225 | |||
1226 | serial_outp(up, UART_LCR, save_lcr); | 1220 | serial_outp(up, UART_LCR, save_lcr); |
1227 | 1221 | ||
1228 | if (up->capabilities != uart_config[up->port.type].flags) { | 1222 | if (up->capabilities != uart_config[up->port.type].flags) { |
@@ -2428,7 +2422,7 @@ serial8250_pm(struct uart_port *port, unsigned int state, | |||
2428 | static unsigned int serial8250_port_size(struct uart_8250_port *pt) | 2422 | static unsigned int serial8250_port_size(struct uart_8250_port *pt) |
2429 | { | 2423 | { |
2430 | if (pt->port.iotype == UPIO_AU) | 2424 | if (pt->port.iotype == UPIO_AU) |
2431 | return 0x100000; | 2425 | return 0x1000; |
2432 | #ifdef CONFIG_ARCH_OMAP | 2426 | #ifdef CONFIG_ARCH_OMAP |
2433 | if (is_omap_port(pt)) | 2427 | if (is_omap_port(pt)) |
2434 | return 0x16 << pt->port.regshift; | 2428 | return 0x16 << pt->port.regshift; |
@@ -2585,6 +2579,13 @@ static void serial8250_config_port(struct uart_port *port, int flags) | |||
2585 | 2579 | ||
2586 | if (flags & UART_CONFIG_TYPE) | 2580 | if (flags & UART_CONFIG_TYPE) |
2587 | autoconfig(up, probeflags); | 2581 | autoconfig(up, probeflags); |
2582 | |||
2583 | #ifdef CONFIG_SERIAL_8250_AU1X00 | ||
2584 | /* if access method is AU, it is a 16550 with a quirk */ | ||
2585 | if (up->port.type == PORT_16550A && up->port.iotype == UPIO_AU) | ||
2586 | up->bugs |= UART_BUG_NOMSR; | ||
2587 | #endif | ||
2588 | |||
2588 | if (up->port.type != PORT_UNKNOWN && flags & UART_CONFIG_IRQ) | 2589 | if (up->port.type != PORT_UNKNOWN && flags & UART_CONFIG_IRQ) |
2589 | autoconfig_irq(up); | 2590 | autoconfig_irq(up); |
2590 | 2591 | ||