serial: sirf: fix the issue that HW flow control doesn't work for BT
[firefly-linux-kernel-4.4.55.git] / drivers / tty / serial / sirfsoc_uart.c
index 9de3eabe57372c49322e45034c99a3de99b59ae9..48cceaf5338adaf78c8096e2fa21fd8b13a17ab2 100644 (file)
@@ -59,50 +59,7 @@ static const struct sirfsoc_baudrate_to_regv baudrate_to_regv[] = {
        {9600, 1114979},
 };
 
-static struct sirfsoc_uart_port sirfsoc_uart_ports[SIRFSOC_UART_NR] = {
-       [0] = {
-               .port = {
-                       .iotype         = UPIO_MEM,
-                       .flags          = UPF_BOOT_AUTOCONF,
-                       .line           = 0,
-               },
-       },
-       [1] = {
-               .port = {
-                       .iotype         = UPIO_MEM,
-                       .flags          = UPF_BOOT_AUTOCONF,
-                       .line           = 1,
-               },
-       },
-       [2] = {
-               .port = {
-                       .iotype         = UPIO_MEM,
-                       .flags          = UPF_BOOT_AUTOCONF,
-                       .line           = 2,
-               },
-       },
-       [3] = {
-               .port = {
-                       .iotype         = UPIO_MEM,
-                       .flags          = UPF_BOOT_AUTOCONF,
-                       .line           = 3,
-               },
-       },
-       [4] = {
-               .port = {
-                       .iotype         = UPIO_MEM,
-                       .flags          = UPF_BOOT_AUTOCONF,
-                       .line           = 4,
-               },
-       },
-       [5] = {
-               .port = {
-                       .iotype         = UPIO_MEM,
-                       .flags          = UPF_BOOT_AUTOCONF,
-                       .line           = 5,
-               },
-       },
-};
+static struct sirfsoc_uart_port *sirf_ports[SIRFSOC_UART_NR];
 
 static inline struct sirfsoc_uart_port *to_sirfport(struct uart_port *port)
 {
@@ -116,8 +73,7 @@ static inline unsigned int sirfsoc_uart_tx_empty(struct uart_port *port)
        struct sirfsoc_register *ureg = &sirfport->uart_reg->uart_reg;
        struct sirfsoc_fifo_status *ufifo_st = &sirfport->uart_reg->fifo_status;
        reg = rd_regl(port, ureg->sirfsoc_tx_fifo_status);
-
-       return (reg & ufifo_st->ff_empty(port->line)) ? TIOCSER_TEMT : 0;
+       return (reg & ufifo_st->ff_empty(port)) ? TIOCSER_TEMT : 0;
 }
 
 static unsigned int sirfsoc_uart_get_mctrl(struct uart_port *port)
@@ -182,16 +138,19 @@ static void sirfsoc_uart_stop_tx(struct uart_port *port)
                                rd_regl(port, ureg->sirfsoc_int_en_reg) &
                                ~uint_en->sirfsoc_txfifo_empty_en);
                        else
-                               wr_regl(port, SIRFUART_INT_EN_CLR,
+                               wr_regl(port, ureg->sirfsoc_int_en_clr_reg,
                                uint_en->sirfsoc_txfifo_empty_en);
                }
        } else {
+               if (sirfport->uart_reg->uart_type == SIRF_USP_UART)
+                       wr_regl(port, ureg->sirfsoc_tx_rx_en, rd_regl(port,
+                               ureg->sirfsoc_tx_rx_en) & ~SIRFUART_TX_EN);
                if (!sirfport->is_atlas7)
                        wr_regl(port, ureg->sirfsoc_int_en_reg,
                                rd_regl(port, ureg->sirfsoc_int_en_reg) &
                                ~uint_en->sirfsoc_txfifo_empty_en);
                else
-                       wr_regl(port, SIRFUART_INT_EN_CLR,
+                       wr_regl(port, ureg->sirfsoc_int_en_clr_reg,
                                uint_en->sirfsoc_txfifo_empty_en);
        }
 }
@@ -222,7 +181,7 @@ static void sirfsoc_uart_tx_with_dma(struct sirfsoc_uart_port *sirfport)
                                rd_regl(port, ureg->sirfsoc_int_en_reg)&
                                ~(uint_en->sirfsoc_txfifo_empty_en));
        else
-               wr_regl(port, SIRFUART_INT_EN_CLR,
+               wr_regl(port, ureg->sirfsoc_int_en_clr_reg,
                                uint_en->sirfsoc_txfifo_empty_en);
        /*
         * DMA requires buffer address and buffer length are both aligned with
@@ -290,8 +249,10 @@ static void sirfsoc_uart_start_tx(struct uart_port *port)
        if (sirfport->tx_dma_chan)
                sirfsoc_uart_tx_with_dma(sirfport);
        else {
-               sirfsoc_uart_pio_tx_chars(sirfport,
-                       SIRFSOC_UART_IO_TX_REASONABLE_CNT);
+               if (sirfport->uart_reg->uart_type == SIRF_USP_UART)
+                       wr_regl(port, ureg->sirfsoc_tx_rx_en, rd_regl(port,
+                               ureg->sirfsoc_tx_rx_en) | SIRFUART_TX_EN);
+               sirfsoc_uart_pio_tx_chars(sirfport, port->fifosize);
                wr_regl(port, ureg->sirfsoc_tx_fifo_op, SIRFUART_FIFO_START);
                if (!sirfport->is_atlas7)
                        wr_regl(port, ureg->sirfsoc_int_en_reg,
@@ -314,21 +275,25 @@ static void sirfsoc_uart_stop_rx(struct uart_port *port)
                if (!sirfport->is_atlas7)
                        wr_regl(port, ureg->sirfsoc_int_en_reg,
                                rd_regl(port, ureg->sirfsoc_int_en_reg) &
-                               ~(SIRFUART_RX_DMA_INT_EN(port, uint_en) |
+                               ~(SIRFUART_RX_DMA_INT_EN(uint_en,
+                               sirfport->uart_reg->uart_type) |
                                uint_en->sirfsoc_rx_done_en));
                else
-                       wr_regl(port, SIRFUART_INT_EN_CLR,
-                                       SIRFUART_RX_DMA_INT_EN(port, uint_en)|
-                                       uint_en->sirfsoc_rx_done_en);
+                       wr_regl(port, ureg->sirfsoc_int_en_clr_reg,
+                               SIRFUART_RX_DMA_INT_EN(uint_en,
+                               sirfport->uart_reg->uart_type)|
+                               uint_en->sirfsoc_rx_done_en);
                dmaengine_terminate_all(sirfport->rx_dma_chan);
        } else {
                if (!sirfport->is_atlas7)
                        wr_regl(port, ureg->sirfsoc_int_en_reg,
                                rd_regl(port, ureg->sirfsoc_int_en_reg)&
-                               ~(SIRFUART_RX_IO_INT_EN(port, uint_en)));
+                               ~(SIRFUART_RX_IO_INT_EN(uint_en,
+                               sirfport->uart_reg->uart_type)));
                else
-                       wr_regl(port, SIRFUART_INT_EN_CLR,
-                                       SIRFUART_RX_IO_INT_EN(port, uint_en));
+                       wr_regl(port, ureg->sirfsoc_int_en_clr_reg,
+                               SIRFUART_RX_IO_INT_EN(uint_en,
+                               sirfport->uart_reg->uart_type));
        }
 }
 
@@ -349,7 +314,7 @@ static void sirfsoc_uart_disable_ms(struct uart_port *port)
                                        rd_regl(port, ureg->sirfsoc_int_en_reg)&
                                        ~uint_en->sirfsoc_cts_en);
                else
-                       wr_regl(port, SIRFUART_INT_EN_CLR,
+                       wr_regl(port, ureg->sirfsoc_int_en_clr_reg,
                                        uint_en->sirfsoc_cts_en);
        } else
                disable_irq(gpio_to_irq(sirfport->cts_gpio));
@@ -379,7 +344,8 @@ static void sirfsoc_uart_enable_ms(struct uart_port *port)
        if (sirfport->uart_reg->uart_type == SIRF_REAL_UART) {
                wr_regl(port, ureg->sirfsoc_afc_ctrl,
                                rd_regl(port, ureg->sirfsoc_afc_ctrl) |
-                               SIRFUART_AFC_TX_EN | SIRFUART_AFC_RX_EN);
+                               SIRFUART_AFC_TX_EN | SIRFUART_AFC_RX_EN |
+                               SIRFUART_AFC_CTRL_RX_THD);
                if (!sirfport->is_atlas7)
                        wr_regl(port, ureg->sirfsoc_int_en_reg,
                                        rd_regl(port, ureg->sirfsoc_int_en_reg)
@@ -417,7 +383,7 @@ sirfsoc_uart_pio_rx_chars(struct uart_port *port, unsigned int max_rx_count)
        if (!tty)
                return -ENODEV;
        while (!(rd_regl(port, ureg->sirfsoc_rx_fifo_status) &
-                                       ufifo_st->ff_empty(port->line))) {
+                                       ufifo_st->ff_empty(port))) {
                ch = rd_regl(port, ureg->sirfsoc_rx_fifo_data) |
                        SIRFUART_DUMMY_READ;
                if (unlikely(uart_handle_sysrq_char(port, ch)))
@@ -444,7 +410,7 @@ sirfsoc_uart_pio_tx_chars(struct sirfsoc_uart_port *sirfport, int count)
        unsigned int num_tx = 0;
        while (!uart_circ_empty(xmit) &&
                !(rd_regl(port, ureg->sirfsoc_tx_fifo_status) &
-                                       ufifo_st->ff_full(port->line)) &&
+                                       ufifo_st->ff_full(port)) &&
                count--) {
                wr_regl(port, ureg->sirfsoc_tx_fifo_data,
                                xmit->buf[xmit->tail]);
@@ -500,7 +466,7 @@ static void sirfsoc_rx_submit_one_dma_desc(struct uart_port *port, int index)
                dmaengine_prep_slave_single(sirfport->rx_dma_chan,
                sirfport->rx_dma_items[index].dma_addr, SIRFSOC_RX_DMA_BUF_SIZE,
                DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT);
-       if (!sirfport->rx_dma_items[index].desc) {
+       if (IS_ERR_OR_NULL(sirfport->rx_dma_items[index].desc)) {
                dev_err(port->dev, "DMA slave single fail\n");
                return;
        }
@@ -520,12 +486,13 @@ static void sirfsoc_rx_tmo_process_tl(unsigned long param)
        struct sirfsoc_int_en *uint_en = &sirfport->uart_reg->uart_int_en;
        struct sirfsoc_int_status *uint_st = &sirfport->uart_reg->uart_int_st;
        unsigned int count;
-       unsigned long flags;
        struct dma_tx_state tx_state;
+       unsigned long flags;
 
        spin_lock_irqsave(&port->lock, flags);
        while (DMA_COMPLETE == dmaengine_tx_status(sirfport->rx_dma_chan,
-               sirfport->rx_dma_items[sirfport->rx_completed].cookie, &tx_state)) {
+               sirfport->rx_dma_items[sirfport->rx_completed].cookie,
+               &tx_state)) {
                sirfsoc_uart_insert_rx_buf_to_tty(sirfport,
                                        SIRFSOC_RX_DMA_BUF_SIZE);
                sirfport->rx_completed++;
@@ -549,7 +516,7 @@ static void sirfsoc_rx_tmo_process_tl(unsigned long param)
                                rd_regl(port, ureg->sirfsoc_int_en_reg) &
                                ~(uint_en->sirfsoc_rx_done_en));
                else
-                       wr_regl(port, SIRFUART_INT_EN_CLR,
+                       wr_regl(port, ureg->sirfsoc_int_en_clr_reg,
                                        uint_en->sirfsoc_rx_done_en);
                sirfsoc_uart_start_next_rx_dma(port);
        } else {
@@ -583,7 +550,7 @@ static void sirfsoc_uart_handle_rx_tmo(struct sirfsoc_uart_port *sirfport)
                        rd_regl(port, ureg->sirfsoc_int_en_reg) &
                        ~(uint_en->sirfsoc_rx_timeout_en));
        else
-               wr_regl(port, SIRFUART_INT_EN_CLR,
+               wr_regl(port, ureg->sirfsoc_int_en_clr_reg,
                                uint_en->sirfsoc_rx_timeout_en);
        tasklet_schedule(&sirfport->rx_tmo_process_tasklet);
 }
@@ -603,7 +570,7 @@ static void sirfsoc_uart_handle_rx_done(struct sirfsoc_uart_port *sirfport)
                                rd_regl(port, ureg->sirfsoc_int_en_reg) &
                                ~(uint_en->sirfsoc_rx_done_en));
                else
-                       wr_regl(port, SIRFUART_INT_EN_CLR,
+                       wr_regl(port, ureg->sirfsoc_int_en_clr_reg,
                                        uint_en->sirfsoc_rx_done_en);
                wr_regl(port, ureg->sirfsoc_int_st_reg,
                                uint_st->sirfsoc_rx_timeout);
@@ -628,7 +595,8 @@ static irqreturn_t sirfsoc_uart_isr(int irq, void *dev_id)
        intr_status = rd_regl(port, ureg->sirfsoc_int_st_reg);
        wr_regl(port, ureg->sirfsoc_int_st_reg, intr_status);
        intr_status &= rd_regl(port, ureg->sirfsoc_int_en_reg);
-       if (unlikely(intr_status & (SIRFUART_ERR_INT_STAT(port, uint_st)))) {
+       if (unlikely(intr_status & (SIRFUART_ERR_INT_STAT(uint_st,
+                               sirfport->uart_reg->uart_type)))) {
                if (intr_status & uint_st->sirfsoc_rxd_brk) {
                        port->icount.brk++;
                        if (uart_handle_break(port))
@@ -667,10 +635,50 @@ recv_char:
                        sirfsoc_uart_handle_rx_tmo(sirfport);
                if (intr_status & uint_st->sirfsoc_rx_done)
                        sirfsoc_uart_handle_rx_done(sirfport);
-       } else {
-               if (intr_status & SIRFUART_RX_IO_INT_ST(uint_st))
-                       sirfsoc_uart_pio_rx_chars(port,
-                                       SIRFSOC_UART_IO_RX_MAX_CNT);
+       } else if (intr_status & SIRFUART_RX_IO_INT_ST(uint_st)) {
+               /*
+                * chip will trigger continuous RX_TIMEOUT interrupt
+                * in RXFIFO empty and not trigger if RXFIFO recevice
+                * data in limit time, original method use RX_TIMEOUT
+                * will trigger lots of useless interrupt in RXFIFO
+                * empty.RXFIFO received one byte will trigger RX_DONE
+                * interrupt.use RX_DONE to wait for data received
+                * into RXFIFO, use RX_THD/RX_FULL for lots data receive
+                * and use RX_TIMEOUT for the last left data.
+                */
+               if (intr_status & uint_st->sirfsoc_rx_done) {
+                       if (!sirfport->is_atlas7) {
+                               wr_regl(port, ureg->sirfsoc_int_en_reg,
+                                       rd_regl(port, ureg->sirfsoc_int_en_reg)
+                                       & ~(uint_en->sirfsoc_rx_done_en));
+                               wr_regl(port, ureg->sirfsoc_int_en_reg,
+                               rd_regl(port, ureg->sirfsoc_int_en_reg)
+                               | (uint_en->sirfsoc_rx_timeout_en));
+                       } else {
+                               wr_regl(port, ureg->sirfsoc_int_en_clr_reg,
+                                       uint_en->sirfsoc_rx_done_en);
+                               wr_regl(port, ureg->sirfsoc_int_en_reg,
+                                       uint_en->sirfsoc_rx_timeout_en);
+                       }
+               } else {
+                       if (intr_status & uint_st->sirfsoc_rx_timeout) {
+                               if (!sirfport->is_atlas7) {
+                                       wr_regl(port, ureg->sirfsoc_int_en_reg,
+                                       rd_regl(port, ureg->sirfsoc_int_en_reg)
+                                       & ~(uint_en->sirfsoc_rx_timeout_en));
+                                       wr_regl(port, ureg->sirfsoc_int_en_reg,
+                                       rd_regl(port, ureg->sirfsoc_int_en_reg)
+                                       | (uint_en->sirfsoc_rx_done_en));
+                               } else {
+                                       wr_regl(port,
+                                               ureg->sirfsoc_int_en_clr_reg,
+                                               uint_en->sirfsoc_rx_timeout_en);
+                                       wr_regl(port, ureg->sirfsoc_int_en_reg,
+                                               uint_en->sirfsoc_rx_done_en);
+                               }
+                       }
+                       sirfsoc_uart_pio_rx_chars(port, port->fifosize);
+               }
        }
        spin_unlock(&port->lock);
        tty_flip_buffer_push(&state->port);
@@ -684,10 +692,10 @@ recv_char:
                                return IRQ_HANDLED;
                        } else {
                                sirfsoc_uart_pio_tx_chars(sirfport,
-                                       SIRFSOC_UART_IO_TX_REASONABLE_CNT);
+                                               port->fifosize);
                                if ((uart_circ_empty(xmit)) &&
                                (rd_regl(port, ureg->sirfsoc_tx_fifo_status) &
-                               ufifo_st->ff_empty(port->line)))
+                               ufifo_st->ff_empty(port)))
                                        sirfsoc_uart_stop_tx(port);
                        }
                }
@@ -703,11 +711,12 @@ static void sirfsoc_uart_rx_dma_complete_tl(unsigned long param)
        struct uart_port *port = &sirfport->port;
        struct sirfsoc_register *ureg = &sirfport->uart_reg->uart_reg;
        struct sirfsoc_int_en *uint_en = &sirfport->uart_reg->uart_int_en;
-       unsigned long flags;
        struct dma_tx_state tx_state;
+       unsigned long flags;
        spin_lock_irqsave(&port->lock, flags);
        while (DMA_COMPLETE == dmaengine_tx_status(sirfport->rx_dma_chan,
-                       sirfport->rx_dma_items[sirfport->rx_completed].cookie, &tx_state)) {
+               sirfport->rx_dma_items[sirfport->rx_completed].cookie,
+               &tx_state)) {
                sirfsoc_uart_insert_rx_buf_to_tty(sirfport,
                                        SIRFSOC_RX_DMA_BUF_SIZE);
                if (rd_regl(port, ureg->sirfsoc_int_en_reg) &
@@ -751,10 +760,12 @@ static void sirfsoc_uart_start_next_rx_dma(struct uart_port *port)
        if (!sirfport->is_atlas7)
                wr_regl(port, ureg->sirfsoc_int_en_reg,
                                rd_regl(port, ureg->sirfsoc_int_en_reg) |
-                               SIRFUART_RX_DMA_INT_EN(port, uint_en));
+                               SIRFUART_RX_DMA_INT_EN(uint_en,
+                               sirfport->uart_reg->uart_type));
        else
                wr_regl(port, ureg->sirfsoc_int_en_reg,
-                       SIRFUART_RX_DMA_INT_EN(port, uint_en));
+                               SIRFUART_RX_DMA_INT_EN(uint_en,
+                               sirfport->uart_reg->uart_type));
 }
 
 static void sirfsoc_uart_start_rx(struct uart_port *port)
@@ -773,10 +784,12 @@ static void sirfsoc_uart_start_rx(struct uart_port *port)
                if (!sirfport->is_atlas7)
                        wr_regl(port, ureg->sirfsoc_int_en_reg,
                                rd_regl(port, ureg->sirfsoc_int_en_reg) |
-                               SIRFUART_RX_IO_INT_EN(port, uint_en));
+                               SIRFUART_RX_IO_INT_EN(uint_en,
+                                       sirfport->uart_reg->uart_type));
                else
                        wr_regl(port, ureg->sirfsoc_int_en_reg,
-                               SIRFUART_RX_IO_INT_EN(port, uint_en));
+                               SIRFUART_RX_IO_INT_EN(uint_en,
+                                       sirfport->uart_reg->uart_type));
        }
 }
 
@@ -789,7 +802,7 @@ sirfsoc_usp_calc_sample_div(unsigned long set_rate,
        unsigned long ioclk_div = 0;
        unsigned long temp_delta;
 
-       for (sample_div = SIRF_MIN_SAMPLE_DIV;
+       for (sample_div = SIRF_USP_MIN_SAMPLE_DIV;
                        sample_div <= SIRF_MAX_SAMPLE_DIV; sample_div++) {
                temp_delta = ioclk_rate -
                (ioclk_rate + (set_rate * sample_div) / 2)
@@ -976,7 +989,7 @@ static void sirfsoc_uart_set_termios(struct uart_port *port,
        wr_regl(port, ureg->sirfsoc_tx_fifo_op,
                        (txfifo_op_reg & ~SIRFUART_FIFO_START));
        if (sirfport->uart_reg->uart_type == SIRF_REAL_UART) {
-               config_reg |= SIRFUART_RECV_TIMEOUT(port, rx_time_out);
+               config_reg |= SIRFUART_UART_RECV_TIMEOUT(rx_time_out);
                wr_regl(port, ureg->sirfsoc_line_ctrl, config_reg);
        } else {
                /*tx frame ctrl*/
@@ -999,7 +1012,7 @@ static void sirfsoc_uart_set_termios(struct uart_port *port,
                wr_regl(port, ureg->sirfsoc_rx_frame_ctrl, len_val);
                /*async param*/
                wr_regl(port, ureg->sirfsoc_async_param_reg,
-                       (SIRFUART_RECV_TIMEOUT(port, rx_time_out)) |
+                       (SIRFUART_USP_RECV_TIMEOUT(rx_time_out)) |
                        (sample_div_reg & SIRFSOC_USP_ASYNC_DIV2_MASK) <<
                        SIRFSOC_USP_ASYNC_DIV2_OFFSET);
        }
@@ -1032,19 +1045,10 @@ static void sirfsoc_uart_pm(struct uart_port *port, unsigned int state,
                              unsigned int oldstate)
 {
        struct sirfsoc_uart_port *sirfport = to_sirfport(port);
-       if (!state) {
-               if (sirfport->is_bt_uart) {
-                       clk_prepare_enable(sirfport->clk_noc);
-                       clk_prepare_enable(sirfport->clk_general);
-               }
+       if (!state)
                clk_prepare_enable(sirfport->clk);
-       } else {
+       else
                clk_disable_unprepare(sirfport->clk);
-               if (sirfport->is_bt_uart) {
-                       clk_disable_unprepare(sirfport->clk_general);
-                       clk_disable_unprepare(sirfport->clk_noc);
-               }
-       }
 }
 
 static int sirfsoc_uart_startup(struct uart_port *port)
@@ -1064,7 +1068,6 @@ static int sirfsoc_uart_startup(struct uart_port *port)
                                                        index, port->irq);
                goto irq_err;
        }
-
        /* initial hardware settings */
        wr_regl(port, ureg->sirfsoc_tx_dma_io_ctrl,
                rd_regl(port, ureg->sirfsoc_tx_dma_io_ctrl) |
@@ -1127,7 +1130,7 @@ static void sirfsoc_uart_shutdown(struct uart_port *port)
        if (!sirfport->is_atlas7)
                wr_regl(port, ureg->sirfsoc_int_en_reg, 0);
        else
-               wr_regl(port, SIRFUART_INT_EN_CLR, ~0UL);
+               wr_regl(port, ureg->sirfsoc_int_en_clr_reg, ~0UL);
 
        free_irq(port->irq, sirfport);
        if (sirfport->ms_enabled)
@@ -1196,27 +1199,29 @@ sirfsoc_uart_console_setup(struct console *co, char *options)
        unsigned int bits = 8;
        unsigned int parity = 'n';
        unsigned int flow = 'n';
-       struct uart_port *port = &sirfsoc_uart_ports[co->index].port;
-       struct sirfsoc_uart_port *sirfport = to_sirfport(port);
-       struct sirfsoc_register *ureg = &sirfport->uart_reg->uart_reg;
+       struct sirfsoc_uart_port *sirfport;
+       struct sirfsoc_register *ureg;
        if (co->index < 0 || co->index >= SIRFSOC_UART_NR)
                return -EINVAL;
-
-       if (!port->mapbase)
+       sirfport = sirf_ports[co->index];
+       if (!sirfport)
+               return -ENODEV;
+       ureg = &sirfport->uart_reg->uart_reg;
+       if (!sirfport->port.mapbase)
                return -ENODEV;
 
        /* enable usp in mode1 register */
        if (sirfport->uart_reg->uart_type == SIRF_USP_UART)
-               wr_regl(port, ureg->sirfsoc_mode1, SIRFSOC_USP_EN |
+               wr_regl(&sirfport->port, ureg->sirfsoc_mode1, SIRFSOC_USP_EN |
                                SIRFSOC_USP_ENDIAN_CTRL_LSBF);
        if (options)
                uart_parse_options(options, &baud, &parity, &bits, &flow);
-       port->cons = co;
+       sirfport->port.cons = co;
 
        /* default console tx/rx transfer using io mode */
        sirfport->rx_dma_chan = NULL;
        sirfport->tx_dma_chan = NULL;
-       return uart_set_options(port, co, baud, parity, bits, flow);
+       return uart_set_options(&sirfport->port, co, baud, parity, bits, flow);
 }
 
 static void sirfsoc_uart_console_putchar(struct uart_port *port, int ch)
@@ -1224,8 +1229,8 @@ static void sirfsoc_uart_console_putchar(struct uart_port *port, int ch)
        struct sirfsoc_uart_port *sirfport = to_sirfport(port);
        struct sirfsoc_register *ureg = &sirfport->uart_reg->uart_reg;
        struct sirfsoc_fifo_status *ufifo_st = &sirfport->uart_reg->fifo_status;
-       while (rd_regl(port,
-               ureg->sirfsoc_tx_fifo_status) & ufifo_st->ff_full(port->line))
+       while (rd_regl(port, ureg->sirfsoc_tx_fifo_status) &
+               ufifo_st->ff_full(port))
                cpu_relax();
        wr_regl(port, ureg->sirfsoc_tx_fifo_data, ch);
 }
@@ -1233,8 +1238,10 @@ static void sirfsoc_uart_console_putchar(struct uart_port *port, int ch)
 static void sirfsoc_uart_console_write(struct console *co, const char *s,
                                                        unsigned int count)
 {
-       struct uart_port *port = &sirfsoc_uart_ports[co->index].port;
-       uart_console_write(port, s, count, sirfsoc_uart_console_putchar);
+       struct sirfsoc_uart_port *sirfport = sirf_ports[co->index];
+
+       uart_console_write(&sirfport->port, s, count,
+                       sirfsoc_uart_console_putchar);
 }
 
 static struct console sirfsoc_uart_console = {
@@ -1269,10 +1276,11 @@ static struct uart_driver sirfsoc_uart_drv = {
 #endif
 };
 
-static const struct of_device_id sirfsoc_uart_ids[] = {
+static struct of_device_id sirfsoc_uart_ids[] = {
        { .compatible = "sirf,prima2-uart", .data = &sirfsoc_uart,},
        { .compatible = "sirf,atlas7-uart", .data = &sirfsoc_uart},
        { .compatible = "sirf,prima2-usp-uart", .data = &sirfsoc_usp},
+       { .compatible = "sirf,atlas7-usp-uart", .data = &sirfsoc_usp},
        {}
 };
 MODULE_DEVICE_TABLE(of, sirfsoc_uart_ids);
@@ -1293,16 +1301,15 @@ static int sirfsoc_uart_probe(struct platform_device *pdev)
        const struct of_device_id *match;
 
        match = of_match_node(sirfsoc_uart_ids, pdev->dev.of_node);
-       if (of_property_read_u32(pdev->dev.of_node, "cell-index", &pdev->id)) {
-               dev_err(&pdev->dev,
-                       "Unable to find cell-index in uart node.\n");
-               ret = -EFAULT;
+       sirfport = devm_kzalloc(&pdev->dev, sizeof(*sirfport), GFP_KERNEL);
+       if (!sirfport) {
+               ret = -ENOMEM;
                goto err;
        }
-       if (of_device_is_compatible(pdev->dev.of_node, "sirf,prima2-usp-uart"))
-               pdev->id += ((struct sirfsoc_uart_register *)
-                               match->data)->uart_param.register_uart_nr;
-       sirfport = &sirfsoc_uart_ports[pdev->id];
+       sirfport->port.line = of_alias_get_id(pdev->dev.of_node, "serial");
+       sirf_ports[sirfport->port.line] = sirfport;
+       sirfport->port.iotype = UPIO_MEM;
+       sirfport->port.flags = UPF_BOOT_AUTOCONF;
        port = &sirfport->port;
        port->dev = &pdev->dev;
        port->private_data = sirfport;
@@ -1310,9 +1317,12 @@ static int sirfsoc_uart_probe(struct platform_device *pdev)
 
        sirfport->hw_flow_ctrl = of_property_read_bool(pdev->dev.of_node,
                "sirf,uart-has-rtscts");
-       if (of_device_is_compatible(pdev->dev.of_node, "sirf,prima2-uart"))
+       if (of_device_is_compatible(pdev->dev.of_node, "sirf,prima2-uart") ||
+               of_device_is_compatible(pdev->dev.of_node, "sirf,atlas7-uart"))
                sirfport->uart_reg->uart_type = SIRF_REAL_UART;
-       if (of_device_is_compatible(pdev->dev.of_node, "sirf,prima2-usp-uart")) {
+       if (of_device_is_compatible(pdev->dev.of_node,
+               "sirf,prima2-usp-uart") || of_device_is_compatible(
+               pdev->dev.of_node, "sirf,atlas7-usp-uart")) {
                sirfport->uart_reg->uart_type = SIRF_USP_UART;
                if (!sirfport->hw_flow_ctrl)
                        goto usp_no_flow_control;
@@ -1350,7 +1360,8 @@ static int sirfsoc_uart_probe(struct platform_device *pdev)
                gpio_direction_output(sirfport->rts_gpio, 1);
        }
 usp_no_flow_control:
-       if (of_device_is_compatible(pdev->dev.of_node, "sirf,atlas7-uart"))
+       if (of_device_is_compatible(pdev->dev.of_node, "sirf,atlas7-uart") ||
+           of_device_is_compatible(pdev->dev.of_node, "sirf,atlas7-usp-uart"))
                sirfport->is_atlas7 = true;
 
        if (of_property_read_u32(pdev->dev.of_node,
@@ -1393,20 +1404,6 @@ usp_no_flow_control:
                goto err;
        }
        port->uartclk = clk_get_rate(sirfport->clk);
-       if (of_device_is_compatible(pdev->dev.of_node, "sirf,atlas7-bt-uart")) {
-               sirfport->clk_general = devm_clk_get(&pdev->dev, "general");
-               if (IS_ERR(sirfport->clk_general)) {
-                       ret = PTR_ERR(sirfport->clk_general);
-                       goto err;
-               }
-               sirfport->clk_noc = devm_clk_get(&pdev->dev, "noc");
-               if (IS_ERR(sirfport->clk_noc)) {
-                       ret = PTR_ERR(sirfport->clk_noc);
-                       goto err;
-               }
-               sirfport->is_bt_uart = true;
-       } else
-               sirfport->is_bt_uart = false;
 
        port->ops = &sirfsoc_uart_ops;
        spin_lock_init(&port->lock);