diff options
Diffstat (limited to 'include/linux/serial_core.h')
| -rw-r--r-- | include/linux/serial_core.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index a3422e7a903a..3412f8b7f2ce 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -37,7 +37,8 @@ #define PORT_16654 11 #define PORT_16850 12 #define PORT_RSA 13 -#define PORT_MAX_8250 13 /* max port ID */ +#define PORT_NS16550A 14 +#define PORT_MAX_8250 14 /* max port ID */ /* * ARM specific type numbers. These are not currently guaranteed @@ -172,6 +173,7 @@ struct uart_port { #define UPF_LOW_LATENCY (1 << 13) #define UPF_BUGGY_UART (1 << 14) #define UPF_AUTOPROBE (1 << 15) +#define UPF_MAGIC_MULTIPLIER (1 << 16) #define UPF_BOOT_ONLYMCA (1 << 22) #define UPF_CONS_FLOW (1 << 23) #define UPF_SHARE_IRQ (1 << 24) @@ -179,7 +181,7 @@ struct uart_port { #define UPF_RESOURCES (1 << 30) #define UPF_IOREMAP (1 << 31) -#define UPF_CHANGE_MASK (0x7fff) +#define UPF_CHANGE_MASK (0x17fff) #define UPF_USR_MASK (UPF_SPD_MASK|UPF_LOW_LATENCY) unsigned int mctrl; /* current modem ctrl settings */ @@ -279,12 +281,11 @@ void uart_write_wakeup(struct uart_port *port); * Baud rate helpers. */ void uart_update_timeout(struct uart_port *port, unsigned int cflag, - unsigned int quot); + unsigned int baud); unsigned int uart_get_baud_rate(struct uart_port *port, struct termios *termios, struct termios *old, unsigned int min, unsigned int max); -unsigned int uart_get_divisor(struct uart_port *port, struct termios *termios, - struct termios *old_termios); +unsigned int uart_get_divisor(struct uart_port *port, unsigned int baud); /* * Console helpers. |