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>

diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c
index aaa3ce22b5b892b9a85aca3fda84f3a0f02a93ac..61c1ad03db5b0159d6b7735838a2a0cb800d7bbd 100644 (file)
--- 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 c43333dfab4ab1b96eee078fead34738a71f8ee2..fb8d0a0026073f4f6e14b46d56d6be7c834f45b3 100644 (file)
--- 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 */