7 files changed, 15 insertions, 224 deletions

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index ec39203b879d..1528de23a650 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2976,6 +2976,9 @@ static int __init serial8250_init(void)
                 "%d ports, IRQ sharing %sabled\n", nr_uarts,
                 share_irqs ? "en" : "dis");
 
+        for (i = 0; i < NR_IRQS; i++)
+                spin_lock_init(&irq_lists[i].lock);
+
 #ifdef CONFIG_SPARC
         ret = sunserial_register_minors(&serial8250_reg, UART_NR);
 #else
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 31786b3b0a68..db783b77a881 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -1123,42 +1123,6 @@ config SERIAL_CPM_CONSOLE
           your boot loader (lilo or loadlin) about how to pass options to the
           kernel at boot time.)
 
-config SERIAL_CPM_SCC1
-        bool "Support for SCC1 serial port"
-        depends on SERIAL_CPM=y
-        help
-          Select this option to use SCC1 as a serial port
-
-config SERIAL_CPM_SCC2
-        bool "Support for SCC2 serial port"
-        depends on SERIAL_CPM=y
-        help
-          Select this option to use SCC2 as a serial port
-
-config SERIAL_CPM_SCC3
-        bool "Support for SCC3 serial port"
-        depends on SERIAL_CPM=y
-        help
-          Select this option to use SCC3 as a serial port
-
-config SERIAL_CPM_SCC4
-        bool "Support for SCC4 serial port"
-        depends on SERIAL_CPM=y
-        help
-          Select this option to use SCC4 as a serial port
-
-config SERIAL_CPM_SMC1
-        bool "Support for SMC1 serial port"
-        depends on SERIAL_CPM=y
-        help
-          Select this option to use SMC1 as a serial port
-
-config SERIAL_CPM_SMC2
-        bool "Support for SMC2 serial port"
-        depends on SERIAL_CPM=y
-        help
-          Select this option to use SMC2 as a serial port
-
 config SERIAL_SGI_L1_CONSOLE
         bool "SGI Altix L1 serial console support"
         depends on IA64_GENERIC || IA64_SGI_SN2
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c
index 25efca5a7a1f..a6c4d744495e 100644
--- a/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -1333,6 +1333,9 @@ static int __devinit cpm_uart_probe(struct of_device *ofdev,
         if (ret)
                 return ret;
 
+        /* initialize the device pointer for the port */
+        pinfo->port.dev = &ofdev->dev;
+
         return uart_add_one_port(&cpm_reg, &pinfo->port);
 }
 
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/serial/cpm_uart/cpm_uart_cpm1.c
index 0f0aff06c596..1b94c56ec239 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm1.c
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.c
@@ -100,7 +100,7 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
                 mem_addr = (u8 *) cpm_dpram_addr(cpm_dpalloc(memsz, 8));
                 dma_addr = (u32)cpm_dpram_phys(mem_addr);
         } else
-                mem_addr = dma_alloc_coherent(NULL, memsz, &dma_addr,
+                mem_addr = dma_alloc_coherent(pinfo->port.dev, memsz, &dma_addr,
                                               GFP_KERNEL);
 
         if (mem_addr == NULL) {
@@ -127,8 +127,8 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
 
 void cpm_uart_freebuf(struct uart_cpm_port *pinfo)
 {
-        dma_free_coherent(NULL, L1_CACHE_ALIGN(pinfo->rx_nrfifos *
-                                               pinfo->rx_fifosize) +
+        dma_free_coherent(pinfo->port.dev, L1_CACHE_ALIGN(pinfo->rx_nrfifos *
+                                                          pinfo->rx_fifosize) +
                           L1_CACHE_ALIGN(pinfo->tx_nrfifos *
                                          pinfo->tx_fifosize), pinfo->mem_addr,
                           pinfo->dma_addr);
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
index b8db4d3eed36..141c0a3333ad 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
@@ -136,7 +136,7 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
                 dma_addr = virt_to_bus(mem_addr);
         }
         else
-                mem_addr = dma_alloc_coherent(NULL, memsz, &dma_addr,
+                mem_addr = dma_alloc_coherent(pinfo->port.dev, memsz, &dma_addr,
                                               GFP_KERNEL);
 
         if (mem_addr == NULL) {
@@ -163,8 +163,8 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
 
 void cpm_uart_freebuf(struct uart_cpm_port *pinfo)
 {
-        dma_free_coherent(NULL, L1_CACHE_ALIGN(pinfo->rx_nrfifos *
-                                               pinfo->rx_fifosize) +
+        dma_free_coherent(pinfo->port.dev, L1_CACHE_ALIGN(pinfo->rx_nrfifos *
+                                                          pinfo->rx_fifosize) +
                           L1_CACHE_ALIGN(pinfo->tx_nrfifos *
                                          pinfo->tx_fifosize), (void __force *)pinfo->mem_addr,
                           pinfo->dma_addr);
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 36126070d9af..6117d3db0b66 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -72,13 +72,8 @@
 #include <linux/console.h>
 #include <linux/delay.h>
 #include <linux/io.h>
-
-#if defined(CONFIG_PPC_MERGE)
 #include <linux/of.h>
 #include <linux/of_platform.h>
-#else
-#include <linux/platform_device.h>
-#endif
 
 #include <asm/mpc52xx.h>
 #include <asm/mpc512x.h>
@@ -107,12 +102,11 @@ static struct uart_port mpc52xx_uart_ports[MPC52xx_PSC_MAXNUM];
          *        it's cleared, then a memset(...,0,...) should be added to
          *        the console_init
          */
-#if defined(CONFIG_PPC_MERGE)
+
 /* lookup table for matching device nodes to index numbers */
 static struct device_node *mpc52xx_uart_nodes[MPC52xx_PSC_MAXNUM];
 
 static void mpc52xx_uart_of_enumerate(void);
-#endif
 
 
 #define PSC(port) ((struct mpc52xx_psc __iomem *)((port)->membase))
@@ -255,17 +249,12 @@ static void mpc52xx_psc_cw_restore_ints(struct uart_port *port)
 /* Search for bus-frequency property in this node or a parent */
 static unsigned long mpc52xx_getuartclk(void *p)
 {
-#if defined(CONFIG_PPC_MERGE)
         /*
          * 5200 UARTs have a / 32 prescaler
          * but the generic serial code assumes 16
          * so return ipb freq / 2
          */
         return mpc52xx_find_ipb_freq(p) / 2;
-#else
-        pr_debug("unexpected call to mpc52xx_getuartclk with arch/ppc\n");
-        return NULL;
-#endif
 }
 
 static struct psc_ops mpc52xx_psc_ops = {
@@ -886,10 +875,6 @@ mpc52xx_console_get_options(struct uart_port *port,
 
         /* CT{U,L}R are write-only ! */
         *baud = CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD;
-#if !defined(CONFIG_PPC_MERGE)
-        if (__res.bi_baudrate)
-                *baud = __res.bi_baudrate;
-#endif
 
         /* Parse them */
         switch (mr1 & MPC52xx_PSC_MODE_BITS_MASK) {
@@ -946,42 +931,6 @@ mpc52xx_console_write(struct console *co, const char *s, unsigned int count)
         psc_ops->cw_restore_ints(port);
 }
 
-#if !defined(CONFIG_PPC_MERGE)
-static int __init
-mpc52xx_console_setup(struct console *co, char *options)
-{
-        struct uart_port *port = &mpc52xx_uart_ports[co->index];
-
-        int baud = CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD;
-        int bits = 8;
-        int parity = 'n';
-        int flow = 'n';
-
-        if (co->index < 0 || co->index >= MPC52xx_PSC_MAXNUM)
-                return -EINVAL;
-
-        /* Basic port init. Needed since we use some uart_??? func before
-         * real init for early access */
-        spin_lock_init(&port->lock);
-        port->uartclk   = __res.bi_ipbfreq / 2; /* Look at CTLR doc */
-        port->ops       = &mpc52xx_uart_ops;
-        port->mapbase   = MPC52xx_PA(MPC52xx_PSCx_OFFSET(co->index+1));
-
-        /* We ioremap ourself */
-        port->membase = ioremap(port->mapbase, MPC52xx_PSC_SIZE);
-        if (port->membase == NULL)
-                return -EINVAL;
-
-        /* Setup the port parameters accoding to options */
-        if (options)
-                uart_parse_options(options, &baud, &parity, &bits, &flow);
-        else
-                mpc52xx_console_get_options(port, &baud, &parity, &bits, &flow);
-
-        return uart_set_options(port, co, baud, parity, bits, flow);
-}
-
-#else
 
 static int __init
 mpc52xx_console_setup(struct console *co, char *options)
@@ -1053,7 +1002,6 @@ mpc52xx_console_setup(struct console *co, char *options)
 
         return uart_set_options(port, co, baud, parity, bits, flow);
 }
-#endif /* defined(CONFIG_PPC_MERGE) */
 
 
 static struct uart_driver mpc52xx_uart_driver;
@@ -1072,9 +1020,7 @@ static struct console mpc52xx_console = {
 static int __init
 mpc52xx_console_init(void)
 {
-#if defined(CONFIG_PPC_MERGE)
         mpc52xx_uart_of_enumerate();
-#endif
         register_console(&mpc52xx_console);
         return 0;
 }
@@ -1100,115 +1046,6 @@ static struct uart_driver mpc52xx_uart_driver = {
         .cons           = MPC52xx_PSC_CONSOLE,
 };
 
-
-#if !defined(CONFIG_PPC_MERGE)
-/* ======================================================================== */
-/* Platform Driver                                                          */
-/* ======================================================================== */
-
-static int __devinit
-mpc52xx_uart_probe(struct platform_device *dev)
-{
-        struct resource *res = dev->resource;
-
-        struct uart_port *port = NULL;
-        int i, idx, ret;
-
-        /* Check validity & presence */
-        idx = dev->id;
-        if (idx < 0 || idx >= MPC52xx_PSC_MAXNUM)
-                return -EINVAL;
-
-        if (!mpc52xx_match_psc_function(idx, "uart"))
-                return -ENODEV;
-
-        /* Init the port structure */
-        port = &mpc52xx_uart_ports[idx];
-
-        spin_lock_init(&port->lock);
-        port->uartclk   = __res.bi_ipbfreq / 2; /* Look at CTLR doc */
-        port->fifosize  = 512;
-        port->iotype    = UPIO_MEM;
-        port->flags     = UPF_BOOT_AUTOCONF |
-                          (uart_console(port) ? 0 : UPF_IOREMAP);
-        port->line      = idx;
-        port->ops       = &mpc52xx_uart_ops;
-        port->dev       = &dev->dev;
-
-        /* Search for IRQ and mapbase */
-        for (i = 0 ; i < dev->num_resources ; i++, res++) {
-                if (res->flags & IORESOURCE_MEM)
-                        port->mapbase = res->start;
-                else if (res->flags & IORESOURCE_IRQ)
-                        port->irq = res->start;
-        }
-        if (!port->irq || !port->mapbase)
-                return -EINVAL;
-
-        /* Add the port to the uart sub-system */
-        ret = uart_add_one_port(&mpc52xx_uart_driver, port);
-        if (!ret)
-                platform_set_drvdata(dev, (void *)port);
-
-        return ret;
-}
-
-static int
-mpc52xx_uart_remove(struct platform_device *dev)
-{
-        struct uart_port *port = (struct uart_port *) platform_get_drvdata(dev);
-
-        platform_set_drvdata(dev, NULL);
-
-        if (port)
-                uart_remove_one_port(&mpc52xx_uart_driver, port);
-
-        return 0;
-}
-
-#ifdef CONFIG_PM
-static int
-mpc52xx_uart_suspend(struct platform_device *dev, pm_message_t state)
-{
-        struct uart_port *port = (struct uart_port *) platform_get_drvdata(dev);
-
-        if (port)
-                uart_suspend_port(&mpc52xx_uart_driver, port);
-
-        return 0;
-}
-
-static int
-mpc52xx_uart_resume(struct platform_device *dev)
-{
-        struct uart_port *port = (struct uart_port *) platform_get_drvdata(dev);
-
-        if (port)
-                uart_resume_port(&mpc52xx_uart_driver, port);
-
-        return 0;
-}
-#endif
-
-/* work with hotplug and coldplug */
-MODULE_ALIAS("platform:mpc52xx-psc");
-
-static struct platform_driver mpc52xx_uart_platform_driver = {
-        .probe          = mpc52xx_uart_probe,
-        .remove         = mpc52xx_uart_remove,
-#ifdef CONFIG_PM
-        .suspend        = mpc52xx_uart_suspend,
-        .resume         = mpc52xx_uart_resume,
-#endif
-        .driver         = {
-                .owner  = THIS_MODULE,
-                .name   = "mpc52xx-psc",
-        },
-};
-#endif /* !defined(CONFIG_PPC_MERGE) */
-
-
-#if defined(CONFIG_PPC_MERGE)
 /* ======================================================================== */
 /* OF Platform Driver                                                       */
 /* ======================================================================== */
@@ -1402,7 +1239,6 @@ static struct of_platform_driver mpc52xx_uart_of_driver = {
                 .name   = "mpc52xx-psc-uart",
         },
 };
-#endif /* defined(CONFIG_PPC_MERGE) */
 
 
 /* ======================================================================== */
@@ -1423,7 +1259,6 @@ mpc52xx_uart_init(void)
                 return ret;
         }
 
-#if defined(CONFIG_PPC_MERGE)
         mpc52xx_uart_of_enumerate();
 
         ret = of_register_platform_driver(&mpc52xx_uart_of_driver);
@@ -1433,16 +1268,6 @@ mpc52xx_uart_init(void)
                 uart_unregister_driver(&mpc52xx_uart_driver);
                 return ret;
         }
-#else
-        psc_ops = &mpc52xx_psc_ops;
-        ret = platform_driver_register(&mpc52xx_uart_platform_driver);
-        if (ret) {
-                printk(KERN_ERR "%s: platform_driver_register failed (%i)\n",
-                       __FILE__, ret);
-                uart_unregister_driver(&mpc52xx_uart_driver);
-                return ret;
-        }
-#endif
 
         return 0;
 }
@@ -1450,11 +1275,7 @@ mpc52xx_uart_init(void)
 static void __exit
 mpc52xx_uart_exit(void)
 {
-#if defined(CONFIG_PPC_MERGE)
         of_unregister_platform_driver(&mpc52xx_uart_of_driver);
-#else
-        platform_driver_unregister(&mpc52xx_uart_platform_driver);
-#endif
         uart_unregister_driver(&mpc52xx_uart_driver);
 }
 
diff --git a/drivers/serial/ucc_uart.c b/drivers/serial/ucc_uart.c
index 5c5d18dcb6ac..539c933b335f 100644
--- a/drivers/serial/ucc_uart.c
+++ b/drivers/serial/ucc_uart.c
@@ -1009,7 +1009,7 @@ static int qe_uart_request_port(struct uart_port *port)
         rx_size = L1_CACHE_ALIGN(qe_port->rx_nrfifos * qe_port->rx_fifosize);
         tx_size = L1_CACHE_ALIGN(qe_port->tx_nrfifos * qe_port->tx_fifosize);
 
-        bd_virt = dma_alloc_coherent(NULL, rx_size + tx_size, &bd_dma_addr,
+        bd_virt = dma_alloc_coherent(port->dev, rx_size + tx_size, &bd_dma_addr,
                 GFP_KERNEL);
         if (!bd_virt) {
                 dev_err(port->dev, "could not allocate buffer descriptors\n");
@@ -1051,7 +1051,7 @@ static void qe_uart_release_port(struct uart_port *port)
                 container_of(port, struct uart_qe_port, port);
         struct ucc_slow_private *uccs = qe_port->us_private;
 
-        dma_free_coherent(NULL, qe_port->bd_size, qe_port->bd_virt,
+        dma_free_coherent(port->dev, qe_port->bd_size, qe_port->bd_virt,
                           qe_port->bd_dma_addr);
 
         ucc_slow_free(uccs);