From: Sascha Hauer Date: Thu, 17 Apr 2008 07:43:14 +0000 (+0100) Subject: [ARM] 4995/1: : Do not use URXD_CHARRDY for polling X-Git-Tag: v2.6.26-rc1~1131^2~2^7~3 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d3c3938ff9855d8996db4083efd62e86b8987eb;p=linux-2.6 [ARM] 4995/1: : Do not use URXD_CHARRDY for polling Do not use the URXD_CHARRDY bit for polling for new characters. This works on i.MX1, but on MX31 the datasheet states that this bit should not be used for polling. On MX27 it is even worse, here we get a bus error when we access the read FIFO when no character is present. Instead, use USR2_RDR (receive data ready) bit. Signed-off-by: Sascha Hauer Signed-off-by: Russell King --- diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index c637ae2191..f7596641f1 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c @@ -356,10 +356,12 @@ static irqreturn_t imx_rxint(int irq, void *dev_id) spin_lock_irqsave(&sport->port.lock,flags); - while ((rx = readl(sport->port.membase + URXD0)) & URXD_CHARRDY) { + while (readl(sport->port.membase + USR2) & USR2_RDR) { flg = TTY_NORMAL; sport->port.icount.rx++; + rx = readl(sport->port.membase + URXD0); + temp = readl(sport->port.membase + USR2); if (temp & USR2_BRCD) { writel(temp | USR2_BRCD, sport->port.membase + USR2);