aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/mpc52xx_uart.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-07-02 15:45:51 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-07-02 15:45:51 -0400
commit947deee8904b3c2edc7f59ab6e6242499e4dc434 (patch)
tree76f7c5b98508df4b6dea7b8dc01d973b9df43e60 /drivers/serial/mpc52xx_uart.c
parent4faf4e0e7d4e1935fbfc5043d3ebd8d51a3d898d (diff)
[SERIAL] Convert fifosize to an unsigned int
Some UARTs have more than 255 bytes of FIFO, which can't be represented by an unsigned char. Change the kernel's internal structure to be an unsigned int, but still export an unsigned char via the TIOCGSERIAL ioctl. If the TIOCSSERIAL ioctl provides a fifo size of 0, assume this means "don't change" otherwise we'll corrupt the larger fifo sizes. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/serial/mpc52xx_uart.c')
-rw-r--r--drivers/serial/mpc52xx_uart.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 6459edc7f5c5..1b2cdc91c228 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -728,8 +728,7 @@ mpc52xx_uart_probe(struct platform_device *dev)
728 728
729 spin_lock_init(&port->lock); 729 spin_lock_init(&port->lock);
730 port->uartclk = __res.bi_ipbfreq / 2; /* Look at CTLR doc */ 730 port->uartclk = __res.bi_ipbfreq / 2; /* Look at CTLR doc */
731 port->fifosize = 255; /* Should be 512 ! But it can't be */ 731 port->fifosize = 512;
732 /* stored in a unsigned char */
733 port->iotype = UPIO_MEM; 732 port->iotype = UPIO_MEM;
734 port->flags = UPF_BOOT_AUTOCONF | 733 port->flags = UPF_BOOT_AUTOCONF |
735 ( uart_console(port) ? 0 : UPF_IOREMAP ); 734 ( uart_console(port) ? 0 : UPF_IOREMAP );