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>

1 files changed, 12 insertions, 7 deletions

diff --git a/drivers/serial/samsung.h b/drivers/serial/samsung.h
index 1fb22343df42..0ac06a07d25f 100644
--- a/drivers/serial/samsung.h
+++ b/drivers/serial/samsung.h
@@ -75,19 +75,24 @@ extern int s3c24xx_serial_probe(struct platform_device *dev,
 extern int __devexit s3c24xx_serial_remove(struct platform_device *dev);
 
 extern int s3c24xx_serial_initconsole(struct platform_driver *drv,
-                                      struct s3c24xx_uart_info *uart);
+                                      struct s3c24xx_uart_info **uart);
 
 extern int s3c24xx_serial_init(struct platform_driver *drv,
                                struct s3c24xx_uart_info *info);
 
 #ifdef CONFIG_SERIAL_SAMSUNG_CONSOLE
 
-#define s3c24xx_console_init(__drv, __inf)                      \
-static int __init s3c_serial_console_init(void)                 \
-{                                                               \
-        return s3c24xx_serial_initconsole(__drv, __inf);        \
-}                                                               \
-                                                                \
+#define s3c24xx_console_init(__drv, __inf)                              \
+static int __init s3c_serial_console_init(void)                         \
+{                                                                       \
+        struct s3c24xx_uart_info *uinfo[CONFIG_SERIAL_SAMSUNG_UARTS];   \
+        int i;                                                          \
+                                                                        \
+        for (i = 0; i < CONFIG_SERIAL_SAMSUNG_UARTS; i++)               \
+                uinfo[i] = __inf;                                       \
+        return s3c24xx_serial_initconsole(__drv, uinfo);                \
+}                                                                       \
+                                                                        \
 console_initcall(s3c_serial_console_init)
 
 #else