On Sun, Dec 18, 2011 at 06:34:14PM +0100, Dirk Behme wrote:
> 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@xxxxxxxxx>
> CC: Saleem Abdulrasool <compnerd@xxxxxxxxxxxx>
> CC: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
> CC: Fabio Estevam <festevam@xxxxxxxxx>
> CC: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
> CC: linux-serial@xxxxxxxxxxxxxxx
> ---
> drivers/tty/serial/imx.c | 38 +++++++++++++++++++++++++++++++-------
> 1 files changed, 31 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
> index 163fc90..6a01c2a 100644
> --- a/drivers/tty/serial/imx.c
> +++ b/drivers/tty/serial/imx.c
> @@ -260,6 +260,31 @@ static inline int is_imx21_uart(struct imx_port *sport)
> }
>
> /*
> + * Save and restore functions for UCR1, UCR2 and UCR3 registers
> + */
> +static void imx_console_mode(struct uart_port *port,
Function name imx_console_mode seems not like a couple with
imx_console_restore. And I guess something like
imx_port_ucrs_save[restore] would be better?
> + unsigned int *ucr1,
> + unsigned int *ucr2,
> + unsigned int *ucr3)
Can we define something like 'struct imx_port_ucrs' to contains these?
Regards,
Shawn
> +{
> + /* save control registers */
> + *ucr1 = readl(port->membase + UCR1);
> + *ucr2 = readl(port->membase + UCR2);
> + *ucr3 = readl(port->membase + UCR3);
> +}
> +
> +static void imx_console_restore(struct uart_port *port,
> + unsigned int ucr1,
> + unsigned int ucr2,
> + unsigned int ucr3)
> +{
> + /* restore control registers */
> + writel(ucr1, port->membase + UCR1);
> + writel(ucr2, port->membase + UCR2);
> + writel(ucr3, port->membase + UCR3);
> +}
> +
> +/*
> * Handle any change of modem status signal since we were last called.
> */
> static void imx_mctrl_check(struct imx_port *sport)
> @@ -1118,13 +1143,13 @@ 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;
> + unsigned int old_ucr1, old_ucr2, old_ucr3, ucr1;
>
> /*
> - * 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_console_mode(&sport->port, &old_ucr1, &old_ucr2, &old_ucr3);
> + ucr1 = old_ucr1;
>
> if (is_imx1_uart(sport))
> ucr1 |= IMX1_UCR1_UARTCLKEN;
> @@ -1139,12 +1164,11 @@ imx_console_write(struct console *co, const char *s, unsigned int count)
>
> /*
> * 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_console_restore(&sport->port, old_ucr1, old_ucr2, old_ucr3);
> }
>
> /*
> --
> 1.7.7.4
--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
