2 files changed, 5 insertions, 4 deletions

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 12900f7083b0..3198c5335f0b 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -458,6 +458,7 @@ config SERIAL_SAMSUNG_UARTS
         int
         depends on ARM && PLAT_SAMSUNG
         default 2 if ARCH_S3C2400
+        default 6 if ARCH_S5P6450
         default 4 if SERIAL_SAMSUNG_UARTS_4
         default 3
         help
@@ -526,12 +527,12 @@ config SERIAL_S3C24A0
           Serial port support for the Samsung S3C24A0 SoC
 
 config SERIAL_S3C6400
-        tristate "Samsung S3C6400/S3C6410/S5P6440/S5PC100 Serial port support"
-        depends on SERIAL_SAMSUNG && (CPU_S3C6400 || CPU_S3C6410 || CPU_S5P6440 || CPU_S5PC100)
+        tristate "Samsung S3C6400/S3C6410/S5P6440/S5P6450/S5PC100 Serial port support"
+        depends on SERIAL_SAMSUNG && (CPU_S3C6400 || CPU_S3C6410 || CPU_S5P6440 || CPU_S5P6450 || CPU_S5PC100)
         select SERIAL_SAMSUNG_UARTS_4
         default y
         help
-          Serial port support for the Samsung S3C6400, S3C6410, S5P6440
+          Serial port support for the Samsung S3C6400, S3C6410, S5P6440, S5P6450
           and S5PC100 SoCs
 
 config SERIAL_S5PV210
diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c
index b1156ba8ad14..7ac2bf5167cd 100644
--- a/drivers/serial/samsung.c
+++ b/drivers/serial/samsung.c
@@ -1101,7 +1101,7 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
         dbg("resource %p (%lx..%lx)\n", res, res->start, res->end);
 
         port->mapbase = res->start;
-        port->membase = S3C_VA_UART + res->start - (S3C_PA_UART & 0xfff00000);
+        port->membase = S3C_VA_UART + (res->start & 0xfffff);
         ret = platform_get_irq(platdev, 0);
         if (ret < 0)
                 port->irq = 0;