1 files changed, 8 insertions, 76 deletions

diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 02469c31bf0b..84a35f699016 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -397,34 +397,10 @@ static unsigned long mpc512x_getuartclk(void *p)
         return mpc5xxx_get_bus_frequency(p);
 }
 
-#define DEFAULT_FIFO_SIZE 16
-
-static unsigned int __init get_fifo_size(struct device_node *np,
-                                         char *fifo_name)
-{
-        const unsigned int *fp;
-
-        fp = of_get_property(np, fifo_name, NULL);
-        if (fp)
-                return *fp;
-
-        pr_warning("no %s property in %s node, defaulting to %d\n",
-                   fifo_name, np->full_name, DEFAULT_FIFO_SIZE);
-
-        return DEFAULT_FIFO_SIZE;
-}
-
-#define FIFOC(_base) ((struct mpc512x_psc_fifo __iomem *) \
-                    ((u32)(_base) + sizeof(struct mpc52xx_psc)))
-
 /* Init PSC FIFO Controller */
 static int __init mpc512x_psc_fifoc_init(void)
 {
         struct device_node *np;
-        void __iomem *psc;
-        unsigned int tx_fifo_size;
-        unsigned int rx_fifo_size;
-        int fifobase = 0; /* current fifo address in 32 bit words */
 
         np = of_find_compatible_node(NULL, NULL,
                                      "fsl,mpc5121-psc-fifo");
@@ -447,51 +423,6 @@ static int __init mpc512x_psc_fifoc_init(void)
                 return -ENODEV;
         }
 
-        for_each_compatible_node(np, NULL, "fsl,mpc5121-psc-uart") {
-                tx_fifo_size = get_fifo_size(np, "fsl,tx-fifo-size");
-                rx_fifo_size = get_fifo_size(np, "fsl,rx-fifo-size");
-
-                /* size in register is in 4 byte units */
-                tx_fifo_size /= 4;
-                rx_fifo_size /= 4;
-                if (!tx_fifo_size)
-                        tx_fifo_size = 1;
-                if (!rx_fifo_size)
-                        rx_fifo_size = 1;
-
-                psc = of_iomap(np, 0);
-                if (!psc) {
-                        pr_err("%s: Can't map %s device\n",
-                                __func__, np->full_name);
-                        continue;
-                }
-
-                /* FIFO space is 4KiB, check if requested size is available */
-                if ((fifobase + tx_fifo_size + rx_fifo_size) > 0x1000) {
-                        pr_err("%s: no fifo space available for %s\n",
-                                __func__, np->full_name);
-                        iounmap(psc);
-                        /*
-                         * chances are that another device requests less
-                         * fifo space, so we continue.
-                         */
-                        continue;
-                }
-                /* set tx and rx fifo size registers */
-                out_be32(&FIFOC(psc)->txsz, (fifobase << 16) | tx_fifo_size);
-                fifobase += tx_fifo_size;
-                out_be32(&FIFOC(psc)->rxsz, (fifobase << 16) | rx_fifo_size);
-                fifobase += rx_fifo_size;
-
-                /* reset and enable the slices */
-                out_be32(&FIFOC(psc)->txcmd, 0x80);
-                out_be32(&FIFOC(psc)->txcmd, 0x01);
-                out_be32(&FIFOC(psc)->rxcmd, 0x80);
-                out_be32(&FIFOC(psc)->rxcmd, 0x01);
-
-                iounmap(psc);
-        }
-
         return 0;
 }
 
@@ -1295,14 +1226,14 @@ mpc52xx_uart_of_probe(struct of_device *op, const struct of_device_id *match)
 
         /* Check validity & presence */
         for (idx = 0; idx < MPC52xx_PSC_MAXNUM; idx++)
-                if (mpc52xx_uart_nodes[idx] == op->node)
+                if (mpc52xx_uart_nodes[idx] == op->dev.of_node)
                         break;
         if (idx >= MPC52xx_PSC_MAXNUM)
                 return -EINVAL;
         pr_debug("Found %s assigned to ttyPSC%x\n",
                  mpc52xx_uart_nodes[idx]->full_name, idx);
 
-        uartclk = psc_ops->getuartclk(op->node);
+        uartclk = psc_ops->getuartclk(op->dev.of_node);
         if (uartclk == 0) {
                 dev_dbg(&op->dev, "Could not find uart clock frequency!\n");
                 return -EINVAL;
@@ -1322,7 +1253,7 @@ mpc52xx_uart_of_probe(struct of_device *op, const struct of_device_id *match)
         port->dev       = &op->dev;
 
         /* Search for IRQ and mapbase */
-        ret = of_address_to_resource(op->node, 0, &res);
+        ret = of_address_to_resource(op->dev.of_node, 0, &res);
         if (ret)
                 return ret;
 
@@ -1332,7 +1263,7 @@ mpc52xx_uart_of_probe(struct of_device *op, const struct of_device_id *match)
                 return -EINVAL;
         }
 
-        psc_ops->get_irq(port, op->node);
+        psc_ops->get_irq(port, op->dev.of_node);
         if (port->irq == NO_IRQ) {
                 dev_dbg(&op->dev, "Could not get irq\n");
                 return -EINVAL;
@@ -1431,15 +1362,16 @@ mpc52xx_uart_of_enumerate(void)
 MODULE_DEVICE_TABLE(of, mpc52xx_uart_of_match);
 
 static struct of_platform_driver mpc52xx_uart_of_driver = {
-        .match_table    = mpc52xx_uart_of_match,
         .probe          = mpc52xx_uart_of_probe,
         .remove         = mpc52xx_uart_of_remove,
 #ifdef CONFIG_PM
         .suspend        = mpc52xx_uart_of_suspend,
         .resume         = mpc52xx_uart_of_resume,
 #endif
-        .driver         = {
-                .name   = "mpc52xx-psc-uart",
+        .driver = {
+                .name = "mpc52xx-psc-uart",
+                .owner = THIS_MODULE,
+                .of_match_table = mpc52xx_uart_of_match,
         },
 };