diff options
| author | Qipan Li <Qipan.Li@csr.com> | 2013-08-25 20:18:41 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-27 16:25:44 -0700 |
| commit | b60dfbae4151fe8c8a59724c43f5f3f66d51695f (patch) | |
| tree | 0187a3edc8fa6ca950622a7b92f1b94ee9839d74 | |
| parent | 459f15c45eee9136c3ceb7d9c1f88d5f2f225689 (diff) | |
serial: sirf: fix the amount of serial ports
SiRFprimaII has three uart ports and three USP-based ports, so there
are totally six lines instead of five.
Signed-off-by: Qipan Li <Qipan.Li@csr.com>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/tty/serial/sirfsoc_uart.c | 7 | ||||
| -rw-r--r-- | drivers/tty/serial/sirfsoc_uart.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c index aaa3ce22b5b8..61c1ad03db5b 100644 --- a/drivers/tty/serial/sirfsoc_uart.c +++ b/drivers/tty/serial/sirfsoc_uart.c @@ -96,6 +96,13 @@ static struct sirfsoc_uart_port sirfsoc_uart_ports[SIRFSOC_UART_NR] = { .line = 4, }, }, + [5] = { + .port = { + .iotype = UPIO_MEM, + .flags = UPF_BOOT_AUTOCONF, + .line = 5, + }, + }, }; static inline struct sirfsoc_uart_port *to_sirfport(struct uart_port *port) diff --git a/drivers/tty/serial/sirfsoc_uart.h b/drivers/tty/serial/sirfsoc_uart.h index c43333dfab4a..fb8d0a002607 100644 --- a/drivers/tty/serial/sirfsoc_uart.h +++ b/drivers/tty/serial/sirfsoc_uart.h @@ -365,7 +365,7 @@ struct sirfsoc_uart_register sirfsoc_uart = { #define SIRFSOC_UART_MINOR 0 #define SIRFUART_PORT_NAME "sirfsoc-uart" #define SIRFUART_MAP_SIZE 0x200 -#define SIRFSOC_UART_NR 5 +#define SIRFSOC_UART_NR 6 #define SIRFSOC_PORT_TYPE 0xa5 /* Baud Rate Calculation */ |