serial: bfin_uart: Make MMR access compatible with 32 bits bf609 style controller.

Simplify serial data width calculation and adapt to bf609 LCR bit mask.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c
index 7924ba6d5dfb4802dcd4c0a30ac6a3424651c0ac..bd97db23985bbc4ae6db1b666ff1900f09afb97d 100644 (file)
--- a/drivers/tty/serial/bfin_uart.c
+++ b/drivers/tty/serial/bfin_uart.c
@@ -594,7 +594,7 @@ static unsigned int bfin_serial_tx_empty(struct uart_port *port)
 static void bfin_serial_break_ctl(struct uart_port *port, int break_state)
 {
        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
-       u16 lcr = UART_GET_LCR(uart);
+       u32 lcr = UART_GET_LCR(uart);
        if (break_state)
                lcr |= SB;
        else
@@ -1068,7 +1068,7 @@ bfin_serial_console_get_options(struct bfin_serial_port *uart, int *baud,
        status = UART_GET_IER(uart) & (ERBFI | ETBEI);
        if (status == (ERBFI | ETBEI)) {
                /* ok, the port was enabled */
-               u16 lcr, clk;
+               u32 lcr, clk;
 
                lcr = UART_GET_LCR(uart);
 
@@ -1079,20 +1079,8 @@ bfin_serial_console_get_options(struct bfin_serial_port *uart, int *baud,
                        else
                                *parity = 'o';
                }
-               switch (lcr & 0x03) {
-               case 0:
-                       *bits = 5;
-                       break;
-               case 1:
-                       *bits = 6;
-                       break;
-               case 2:
-                       *bits = 7;
-                       break;
-               case 3:
-                       *bits = 8;
-                       break;
-               }
+               *bits = ((lcr & WLS_MASK) >> WLS_OFFSET) + 5;
+
                /* Set DLAB in LCR to Access CLK */
                UART_SET_DLAB(uart);