Revert "serial: imx: Move imx_port_ucrs_save/restore under CONFIG_CONSOLE_POLL"
Subsystems (2)
Fabio Estevam
reviewerPATCH 1/1 Revert "serial: imx: Move imx_port_ucrs_save/restore under CONFIG_CONSOLE_POLL"
From: Fabio Estevam <[email protected]>>
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.
Signed-off-by Fabio Estevam <[email protected]>
--- drivers/tty/serial/imx.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-)
drivers/tty/serial/imx.c +21 -21
@@ -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;
Signature · 1 line
1.7.9.5
Greg KH
maintainerQuoted 11 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>>
This reverts commit
cdc8da3998dcc50cee2f81904c16ebdbd7ec2cee.In my attempt to fix a build warning on arm randconfig a build error on
imx_v6_v7_defconfigwas introduced, so revert it for now.Signed-off-by Fabio Estevam <[email protected]>--- drivers/tty/serial/imx.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-)
You forgot to add a "Reported-by:" line to this patch, I'll go do so...