summaryrefslogtreecommitdiff
path: root/drivers/serial/samsung.c
diff options
context:
space:
mode:
authorThomas Abraham <thomas.ab@samsung.com>2010-01-14 15:05:38 +0900
committerBen Dooks <ben-linux@fluff.org>2010-01-19 17:50:47 +0900
commit51fe52229e3765dc56b8d2dd5df656fbf8a20500 (patch)
tree5d26164280bdd77137df3e3db04069702c182bd2 /drivers/serial/samsung.c
parentbb9b1c772727849051e485a877aa9a4b2d3ac1a1 (diff)
downloadlinux-3.10-51fe52229e3765dc56b8d2dd5df656fbf8a20500.tar.gz
linux-3.10-51fe52229e3765dc56b8d2dd5df656fbf8a20500.tar.bz2
linux-3.10-51fe52229e3765dc56b8d2dd5df656fbf8a20500.zip
ARM: SAMSUNG: serial: Modify console initialization.
This patch modifies s3c24xx_serial_initconsole function to accept multiple platform UART information structures. This is required on platforms that have differences among the instances of UART ports. As an example, the FIFO sizes could be different for each UART instance and hence multiple platform UART information structures would be needed. This patch also modifies the s3c24xx_console_init macro since it wraps the call to the s3c24xx_serial_initconsole function. Signed-off-by: Thomas Abraham <thomas.ab@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'drivers/serial/samsung.c')
-rw-r--r--drivers/serial/samsung.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c
index 52e3df113ec..6982243736d 100644
--- a/drivers/serial/samsung.c
+++ b/drivers/serial/samsung.c
@@ -1374,7 +1374,7 @@ s3c24xx_serial_get_options(struct uart_port *port, int *baud,
* data.
*/
-static int s3c24xx_serial_init_ports(struct s3c24xx_uart_info *info)
+static int s3c24xx_serial_init_ports(struct s3c24xx_uart_info **info)
{
struct s3c24xx_uart_port *ptr = s3c24xx_serial_ports;
struct platform_device **platdev_ptr;
@@ -1385,7 +1385,7 @@ static int s3c24xx_serial_init_ports(struct s3c24xx_uart_info *info)
platdev_ptr = s3c24xx_uart_devs;
for (i = 0; i < CONFIG_SERIAL_SAMSUNG_UARTS; i++, ptr++, platdev_ptr++) {
- s3c24xx_serial_init_port(ptr, info, *platdev_ptr);
+ s3c24xx_serial_init_port(ptr, info[i], *platdev_ptr);
}
return 0;
@@ -1451,7 +1451,7 @@ static struct console s3c24xx_serial_console = {
};
int s3c24xx_serial_initconsole(struct platform_driver *drv,
- struct s3c24xx_uart_info *info)
+ struct s3c24xx_uart_info **info)
{
struct platform_device *dev = s3c24xx_uart_devs[0];