From 58935433625afb6246722f699f1e64114beb5ebb Mon Sep 17 00:00:00 2001
From: Thomas Abraham <thomas.abraham@linaro.org>
Date: Tue, 1 Jan 2013 00:21:55 -0800
Subject: [PATCH] --- yaml --- r: 354754 b: refs/heads/master c:
 41147bfdc5c0d6acb39d2b3b8a4eb6ffb08e4b42 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/tty/serial/samsung.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f70c599c2258..12a282e8d29b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81a7d777497aa4f8c4b5f46b2b8b978779840462
+refs/heads/master: 41147bfdc5c0d6acb39d2b3b8a4eb6ffb08e4b42
diff --git a/trunk/drivers/tty/serial/samsung.c b/trunk/drivers/tty/serial/samsung.c
index 12e5249d053e..96ae08f34770 100644
--- a/trunk/drivers/tty/serial/samsung.c
+++ b/trunk/drivers/tty/serial/samsung.c
@@ -47,7 +47,6 @@
 #include <asm/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/map.h>
 
 #include <plat/regs-serial.h>
 #include <plat/clock.h>
@@ -1144,8 +1143,13 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
 
 	dbg("resource %p (%lx..%lx)\n", res, res->start, res->end);
 
+	port->membase = devm_ioremap(port->dev, res->start, resource_size(res));
+	if (!port->membase) {
+		dev_err(port->dev, "failed to remap controller address\n");
+		return -EBUSY;
+	}
+
 	port->mapbase = res->start;
-	port->membase = S3C_VA_UART + (res->start & 0xfffff);
 	ret = platform_get_irq(platdev, 0);
 	if (ret < 0)
 		port->irq = 0;