diff options
| author | fabio.estevam@freescale.com <fabio.estevam@freescale.com> | 2013-02-06 19:00:02 -0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-06 13:36:54 -0800 |
| commit | 44a754117a53cf965d9e17767463a52c9d9ccbb3 (patch) | |
| tree | 1a721a64eb4e41cc1b036d1c14fe8c8afd4ed2f4 /drivers/tty | |
| parent | 238d9f6e551d87bd6fbcfa3069592dfb407937fb (diff) | |
| download | op-kernel-dev-44a754117a53cf965d9e17767463a52c9d9ccbb3.zip op-kernel-dev-44a754117a53cf965d9e17767463a52c9d9ccbb3.tar.gz | |
Revert "serial: imx: Move imx_port_ucrs_save/restore under CONFIG_CONSOLE_POLL"
This reverts commit cdc8da3998dcc50cee2f81904c16ebdbd7ec2cee.
In my attempt to fix a build warning on arm randconfig a build error on
imx_v6_v7_defconfig was introduced, so revert it for now.
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/imx.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index a657f96..a220f77 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -269,6 +269,27 @@ static inline int is_imx21_uart(struct imx_port *sport) } /* + * 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. */ static void imx_mctrl_check(struct imx_port *sport) @@ -1082,27 +1103,6 @@ imx_verify_port(struct uart_port *port, struct serial_struct *ser) } #if defined(CONFIG_CONSOLE_POLL) -/* - * 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); -} - static int imx_poll_get_char(struct uart_port *port) { struct imx_port_ucrs old_ucr; |
