serial: imx: Disable new features of autobaud detection

Bit 7 of UCR3 is described in the i.MX reference manuals (with the exception
of i.MX1) as follows:

ADNIMP: Autobaud Detection Not Improved-. Disables new features of
	autobaud detection (See Baud Rate Automatic Detection
	Protocol, for more details).

	0 Autobaud detection new features selected
	1 Keep old autobaud detection mechanism

The "new features" mechanism occasionally cause the receiver to get out of sync
and continuously produce received characters of '\xff'.

In order to reproduce the problem:

$ stty -F /dev/ttymxc0 19200

- Change the terminal baudrate to 19200

- Type in the console and it should look good

- Change the terminal baudrate back to 115200

- Type 'b' in the console, then a stream of garbage characters is seen.

Also rename the bit definition as per the reference manual.

Tested on mx6q, mx6dl, mx6solo and mx53.

Based on a patch from Eric Nelson for U-boot.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Tested-by: Eric Nelson <eric.nelson@boundarydevices.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 3b6c1a2e25de..392154d13614 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -116,7 +116,7 @@
 #define UCR3_DSR        (1<<10) /* Data set ready */
 #define UCR3_DCD        (1<<9)  /* Data carrier detect */
 #define UCR3_RI         (1<<8)  /* Ring indicator */
-#define UCR3_TIMEOUTEN  (1<<7)  /* Timeout interrupt enable */
+#define UCR3_ADNIMP     (1<<7)  /* Autobaud Detection Not Improved */
 #define UCR3_RXDSEN     (1<<6)  /* Receive status interrupt enable */
 #define UCR3_AIRINTEN   (1<<5)  /* Async IR wake interrupt enable */
 #define UCR3_AWAKEN     (1<<4)  /* Async wake interrupt enable */
@@ -1174,7 +1174,7 @@ static int imx_startup(struct uart_port *port)
 
         if (!is_imx1_uart(sport)) {
                 temp = readl(sport->port.membase + UCR3);
-                temp |= IMX21_UCR3_RXDMUXSEL;
+                temp |= IMX21_UCR3_RXDMUXSEL | UCR3_ADNIMP;
                 writel(temp, sport->port.membase + UCR3);
         }