summaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2015-06-09 09:26:44 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2015-06-09 09:26:44 +0200
commit7a429bfb3b11a4af5ab0a328a22c354b3838a7a7 (patch)
treeba8f6854c8a267c1ea6a5a591456de52ca45e02e /drivers/serial
parent760e652a7aca15c3ba67f3e7ad4488d49f7a629a (diff)
parent79eba3029f330682d9ba1f5d248720c761de14a7 (diff)
downloadbarebox-7a429bfb3b11a4af5ab0a328a22c354b3838a7a7.tar.gz
barebox-7a429bfb3b11a4af5ab0a328a22c354b3838a7a7.tar.xz
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/serial_ar933x.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/serial_ar933x.c b/drivers/serial/serial_ar933x.c
index 51184aaae5..59bb5b2ecf 100644
--- a/drivers/serial/serial_ar933x.c
+++ b/drivers/serial/serial_ar933x.c
@@ -40,7 +40,7 @@ static inline void ar933x_serial_writel(struct console_device *cdev,
{
struct ar933x_uart_priv *priv = cdev->dev->priv;
- cpu_writel(b, priv->base + offset);
+ __raw_writel(b, priv->base + offset);
}
static inline u32 ar933x_serial_readl(struct console_device *cdev,
@@ -48,7 +48,7 @@ static inline u32 ar933x_serial_readl(struct console_device *cdev,
{
struct ar933x_uart_priv *priv = cdev->dev->priv;
- return cpu_readl(priv->base + offset);
+ return __raw_readl(priv->base + offset);
}
/*