aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/samsung.c
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2008-10-21 09:07:03 -0400
committerBen Dooks <ben-linux@fluff.org>2008-12-15 16:58:11 -0500
commitb690ace50be7d10d77cb7a6d5ef1bd9de649852f (patch)
tree280a5f1ae30ad16669e02f664923afaf4d0d41c3 /drivers/serial/samsung.c
parentcf18acf0e04260ff8ffa46dc245d3d2324ed41b0 (diff)
[ARM] S3C6400: serial support for S3C6400 and S3C6410 SoCs
Add support to the Samsung serial driver for the S3C6400 and S3C6410 serial ports. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'drivers/serial/samsung.c')
-rw-r--r--drivers/serial/samsung.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c
index bb8b57aae3af..44fc38afa228 100644
--- a/drivers/serial/samsung.c
+++ b/drivers/serial/samsung.c
@@ -47,9 +47,9 @@
47#include <asm/irq.h> 47#include <asm/irq.h>
48 48
49#include <mach/hardware.h> 49#include <mach/hardware.h>
50#include <mach/map.h>
50 51
51#include <plat/regs-serial.h> 52#include <plat/regs-serial.h>
52#include <mach/regs-gpio.h>
53 53
54#include "samsung.h" 54#include "samsung.h"
55 55
@@ -756,6 +756,8 @@ static const char *s3c24xx_serial_type(struct uart_port *port)
756 return "S3C2440"; 756 return "S3C2440";
757 case PORT_S3C2412: 757 case PORT_S3C2412:
758 return "S3C2412"; 758 return "S3C2412";
759 case PORT_S3C6400:
760 return "S3C6400/10";
759 default: 761 default:
760 return NULL; 762 return NULL;
761 } 763 }
@@ -1034,8 +1036,8 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
1034 1036
1035 dbg("resource %p (%lx..%lx)\n", res, res->start, res->end); 1037 dbg("resource %p (%lx..%lx)\n", res, res->start, res->end);
1036 1038
1037 port->mapbase = res->start; 1039 port->mapbase = res->start;
1038 port->membase = S3C24XX_VA_UART + (res->start - S3C24XX_PA_UART); 1040 port->membase = S3C_VA_UART + res->start - (S3C_PA_UART & 0xfff00000);
1039 ret = platform_get_irq(platdev, 0); 1041 ret = platform_get_irq(platdev, 0);
1040 if (ret < 0) 1042 if (ret < 0)
1041 port->irq = 0; 1043 port->irq = 0;