imx: Add save/restore functions for UART control regs

Factor out the uart save/restore functionality instead of
having the same code several times in the driver.

Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
CC: Saleem Abdulrasool <compnerd@compnerd.org>
CC: Sascha Hauer <s.hauer@pengutronix.de>
CC: Fabio Estevam <festevam@gmail.com>
CC: Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
CC: linux-serial@vger.kernel.org
CC: Alan Cox <alan@linux.intel.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index a2a33fb815cae65e3eafb3e5cd1844fc96f2263b..d7acd41497d2b1e63f9b8130491fb1cd4c35371d 100644 (file)
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -215,12 +215,39 @@ struct imx_port {
        wait_queue_head_t       dma_wait;
 };
 
+struct imx_port_ucrs {
+       unsigned int    ucr1;
+       unsigned int    ucr2;
+       unsigned int    ucr3;
+};
+
 #ifdef CONFIG_IRDA
 #define USE_IRDA(sport)        ((sport)->use_irda)
 #else
 #define USE_IRDA(sport)        (0)
 #endif
 
+/*
+ * Save and restore functions for UCR1, UCR2 and UCR3 registers
+ */
+static void imx_port_ucrs_save(struct uart_port *port,
+                              struct imx_port_ucrs *ucr)
+{
+       /* save control registers */
+       ucr->ucr1 = readl(port->membase + UCR1);
+       ucr->ucr2 = readl(port->membase + UCR2);
+       ucr->ucr3 = readl(port->membase + UCR3);
+}
+
+static void imx_port_ucrs_restore(struct uart_port *port,
+                                 struct imx_port_ucrs *ucr)
+{
+       /* restore control registers */
+       writel(ucr->ucr1, port->membase + UCR1);
+       writel(ucr->ucr2, port->membase + UCR2);
+       writel(ucr->ucr3, port->membase + UCR3);
+}
+
 /*
  * Handle any change of modem status signal since we were last called.
  */
@@ -1440,7 +1467,8 @@ static void
 imx_console_write(struct console *co, const char *s, unsigned int count)
 {
        struct imx_port *sport = imx_ports[co->index];
-       unsigned int old_ucr1, old_ucr2, ucr1;
+       struct imx_port_ucrs old_ucr;
+       unsigned int ucr1;
        unsigned long flags;
        int locked = 1;
 
@@ -1451,10 +1479,10 @@ imx_console_write(struct console *co, const char *s, unsigned int count)
                spin_lock(&sport->port.lock);
 
        /*
-        *      First, save UCR1/2 and then disable interrupts
+        *      First, save UCR1/2/3 and then disable interrupts
         */
-       ucr1 = old_ucr1 = readl(sport->port.membase + UCR1);
-       old_ucr2 = readl(sport->port.membase + UCR2);
+       imx_port_ucrs_save(&sport->port, &old_ucr);
+       ucr1 = old_ucr.ucr1;
 
        if (cpu_is_mx1())
                ucr1 |= MX1_UCR1_UARTCLKEN;
@@ -1463,18 +1491,17 @@ imx_console_write(struct console *co, const char *s, unsigned int count)
 
        writel(ucr1, sport->port.membase + UCR1);
 
-       writel(old_ucr2 | UCR2_TXEN, sport->port.membase + UCR2);
+       writel(old_ucr.ucr2 | UCR2_TXEN, sport->port.membase + UCR2);
 
        uart_console_write(&sport->port, s, count, imx_console_putchar);
 
        /*
         *      Finally, wait for transmitter to become empty
-        *      and restore UCR1/2
+        *      and restore UCR1/2/3
         */
        while (!(readl(sport->port.membase + USR2) & USR2_TXDC));
 
-       writel(old_ucr1, sport->port.membase + UCR1);
-       writel(old_ucr2, sport->port.membase + UCR2);
+       imx_port_ucrs_restore(&sport->port, &old_ucr);
 
        if (locked)
                spin_unlock(&sport->port.lock);