Merge branch 'linus' into x86/urgent

Merge reason: pull in latest to fix a bug in it.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 10 insertions, 64 deletions

diff --git a/arch/arm/mach-davinci/serial.c b/arch/arm/mach-davinci/serial.c
index 695075796522..c530c7333d0a 100644
--- a/arch/arm/mach-davinci/serial.c
+++ b/arch/arm/mach-davinci/serial.c
@@ -33,6 +33,8 @@
 #include <mach/serial.h>
 #include <mach/irqs.h>
 #include <mach/cputype.h>
+#include <mach/common.h>
+
 #include "clock.h"
 
 static inline unsigned int serial_read_reg(struct plat_serial8250_port *up,
@@ -49,44 +51,6 @@ static inline void serial_write_reg(struct plat_serial8250_port *p, int offset,
         __raw_writel(value, IO_ADDRESS(p->mapbase) + offset);
 }
 
-static struct plat_serial8250_port serial_platform_data[] = {
-        {
-                .mapbase        = DAVINCI_UART0_BASE,
-                .irq            = IRQ_UARTINT0,
-                .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |
-                                  UPF_IOREMAP,
-                .iotype         = UPIO_MEM,
-                .regshift       = 2,
-        },
-        {
-                .mapbase        = DAVINCI_UART1_BASE,
-                .irq            = IRQ_UARTINT1,
-                .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |
-                                  UPF_IOREMAP,
-                .iotype         = UPIO_MEM,
-                .regshift       = 2,
-        },
-        {
-                .mapbase        = DAVINCI_UART2_BASE,
-                .irq            = IRQ_UARTINT2,
-                .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |
-                                  UPF_IOREMAP,
-                .iotype         = UPIO_MEM,
-                .regshift       = 2,
-        },
-        {
-                .flags          = 0
-        },
-};
-
-static struct platform_device serial_device = {
-        .name                   = "serial8250",
-        .id                     = PLAT8250_DEV_PLATFORM,
-        .dev                    = {
-                .platform_data  = serial_platform_data,
-        },
-};
-
 static void __init davinci_serial_reset(struct plat_serial8250_port *p)
 {
         unsigned int pwremu = 0;
@@ -106,35 +70,22 @@ static void __init davinci_serial_reset(struct plat_serial8250_port *p)
                                  UART_DM646X_SCR_TX_WATERMARK);
 }
 
-void __init davinci_serial_init(struct davinci_uart_config *info)
+int __init davinci_serial_init(struct davinci_uart_config *info)
 {
         int i;
         char name[16];
         struct clk *uart_clk;
-        struct device *dev = &serial_device.dev;
+        struct davinci_soc_info *soc_info = &davinci_soc_info;
+        struct device *dev = &soc_info->serial_dev->dev;
+        struct plat_serial8250_port *p = dev->platform_data;
 
         /*
          * Make sure the serial ports are muxed on at this point.
-         * You have to mux them off in device drivers later on
-         * if not needed.
+         * You have to mux them off in device drivers later on if not needed.
          */
-        for (i = 0; i < DAVINCI_MAX_NR_UARTS; i++) {
-                struct plat_serial8250_port *p = serial_platform_data + i;
-
-                if (!(info->enabled_uarts & (1 << i))) {
-                        p->flags = 0;
+        for (i = 0; i < DAVINCI_MAX_NR_UARTS; i++, p++) {
+                if (!(info->enabled_uarts & (1 << i)))
                         continue;
-                }
-
-                if (cpu_is_davinci_dm646x())
-                        p->iotype = UPIO_MEM32;
-
-                if (cpu_is_davinci_dm355()) {
-                        if (i == 2) {
-                                p->mapbase = (unsigned long)DM355_UART2_BASE;
-                                p->irq = IRQ_DM355_UARTINT2;
-                        }
-                }
 
                 sprintf(name, "uart%d", i);
                 uart_clk = clk_get(dev, name);
@@ -147,11 +98,6 @@ void __init davinci_serial_init(struct davinci_uart_config *info)
                         davinci_serial_reset(p);
                 }
         }
-}
 
-static int __init davinci_init(void)
-{
-        return platform_device_register(&serial_device);
+        return platform_device_register(soc_info->serial_dev);
 }
-
-arch_initcall(davinci_init);