serial: imx: Use devm_ioremap_resource()

[karo-tx-linux.git] / drivers / tty / serial / imx.c

diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index b2cfdb661947ec2690fc4840e089688151749a68..d1859724bf2a36a0b8be3b59027409d27b8bd3ce 100644 (file)
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -496,8 +496,7 @@ static void dma_tx_callback(void *data)
 
        dev_dbg(sport->port.dev, "we finish the TX DMA.\n");
 
-       if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-               uart_write_wakeup(&sport->port);
+       uart_write_wakeup(&sport->port);
 
        if (waitqueue_active(&sport->dma_wait)) {
                wake_up(&sport->dma_wait);
@@ -806,6 +805,9 @@ static unsigned int imx_get_mctrl(struct uart_port *port)
        if (readl(sport->port.membase + UCR2) & UCR2_CTS)
                tmp |= TIOCM_RTS;
 
+       if (readl(sport->port.membase + uts_reg(sport)) & UTS_LOOP)
+               tmp |= TIOCM_LOOP;
+
        return tmp;
 }
 
@@ -821,6 +823,11 @@ static void imx_set_mctrl(struct uart_port *port, unsigned int mctrl)
                        temp |= UCR2_CTS;
 
        writel(temp, sport->port.membase + UCR2);
+
+       temp = readl(sport->port.membase + uts_reg(sport)) & ~UTS_LOOP;
+       if (mctrl & TIOCM_LOOP)
+               temp |= UTS_LOOP;
+       writel(temp, sport->port.membase + uts_reg(sport));
 }
 
 /*
@@ -1461,36 +1468,6 @@ static const char *imx_type(struct uart_port *port)
        return sport->port.type == PORT_IMX ? "IMX" : NULL;
 }
 
-/*
- * Release the memory region(s) being used by 'port'.
- */
-static void imx_release_port(struct uart_port *port)
-{
-       struct platform_device *pdev = to_platform_device(port->dev);
-       struct resource *mmres;
-
-       mmres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       release_mem_region(mmres->start, resource_size(mmres));
-}
-
-/*
- * Request the memory region(s) being used by 'port'.
- */
-static int imx_request_port(struct uart_port *port)
-{
-       struct platform_device *pdev = to_platform_device(port->dev);
-       struct resource *mmres;
-       void *ret;
-
-       mmres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!mmres)
-               return -ENODEV;
-
-       ret = request_mem_region(mmres->start, resource_size(mmres), "imx-uart");
-
-       return  ret ? 0 : -EBUSY;
-}
-
 /*
  * Configure/autoconfigure the port.
  */
@@ -1498,8 +1475,7 @@ static void imx_config_port(struct uart_port *port, int flags)
 {
        struct imx_port *sport = (struct imx_port *)port;
 
-       if (flags & UART_CONFIG_TYPE &&
-           imx_request_port(&sport->port) == 0)
+       if (flags & UART_CONFIG_TYPE)
                sport->port.type = PORT_IMX;
 }
 
@@ -1609,8 +1585,6 @@ static struct uart_ops imx_pops = {
        .flush_buffer   = imx_flush_buffer,
        .set_termios    = imx_set_termios,
        .type           = imx_type,
-       .release_port   = imx_release_port,
-       .request_port   = imx_request_port,
        .config_port    = imx_config_port,
        .verify_port    = imx_verify_port,
 #if defined(CONFIG_CONSOLE_POLL)
@@ -1943,12 +1917,9 @@ static int serial_imx_probe(struct platform_device *pdev)
                return ret;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res)
-               return -ENODEV;
-
-       base = devm_ioremap(&pdev->dev, res->start, PAGE_SIZE);
-       if (!base)
-               return -ENOMEM;
+       base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(base))
+               return PTR_ERR(base);
 
        sport->port.dev = &pdev->dev;
        sport->port.mapbase = res->start;