summaryrefslogtreecommitdiffstats
path: root/drivers/serial/serial_imx.c
diff options
context:
space:
mode:
authorAndrey Smirnov <andrew.smirnov@gmail.com>2015-05-13 19:54:22 -0700
committerSascha Hauer <s.hauer@pengutronix.de>2015-05-15 07:18:36 +0200
commit7f9b96cd96332b7a569e21612d3b905b7691c637 (patch)
treef11f65f500a48999b583156c2a329fa555de9c12 /drivers/serial/serial_imx.c
parenta66596282413ddf9a438c36da97fa6050f1851e8 (diff)
downloadbarebox-7f9b96cd96332b7a569e21612d3b905b7691c637.tar.gz
serial: i.MX: Write settings to a correct register
Fix what looks like a copy and past error, where settings for USR1 register were being written to USR2. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/serial/serial_imx.c')
-rw-r--r--drivers/serial/serial_imx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c
index ed00a91..68b438b 100644
--- a/drivers/serial/serial_imx.c
+++ b/drivers/serial/serial_imx.c
@@ -113,10 +113,10 @@ static int imx_serial_init_port(struct console_device *cdev)
writel(val, regs + USR2);
/* Clear status flags */
- val = readl(regs + USR2);
+ val = readl(regs + USR1);
val |= USR1_PARITYERR | USR1_RTSD | USR1_ESCF | USR1_FRAMERR | USR1_AIRINT |
USR1_AWAKE;
- writel(val, regs + USR2);
+ writel(val, regs + USR1);
return 0;
}