Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx

1 files changed, 15 insertions, 38 deletions

diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c
index 80943409edb0..1a7bccebd503 100644
--- a/drivers/serial/uartlite.c
+++ b/drivers/serial/uartlite.c
@@ -17,10 +17,21 @@
 #include <linux/tty.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/init.h>
 #include <asm/io.h>
 #if defined(CONFIG_OF)
+#include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
+
+/* Match table for of_platform binding */
+static struct of_device_id ulite_of_match[] __devinitdata = {
+        { .compatible = "xlnx,opb-uartlite-1.00.b", },
+        { .compatible = "xlnx,xps-uartlite-1.00.a", },
+        {}
+};
+MODULE_DEVICE_TABLE(of, ulite_of_match);
+
 #endif
 
 #define ULITE_NAME              "ttyUL"
@@ -275,6 +286,9 @@ static void ulite_release_port(struct uart_port *port)
 
 static int ulite_request_port(struct uart_port *port)
 {
+        pr_debug("ulite console: port=%p; port->mapbase=%x\n",
+                 port, port->mapbase);
+
         if (!request_mem_region(port->mapbase, ULITE_REGION, "uartlite")) {
                 dev_err(port->dev, "Memory region busy\n");
                 return -EBUSY;
@@ -375,32 +389,6 @@ static void ulite_console_write(struct console *co, const char *s,
                 spin_unlock_irqrestore(&port->lock, flags);
 }
 
-#if defined(CONFIG_OF)
-static inline void __init ulite_console_of_find_device(int id)
-{
-        struct device_node *np;
-        struct resource res;
-        const unsigned int *of_id;
-        int rc;
-
-        for_each_compatible_node(np, NULL, "xilinx,uartlite") {
-                of_id = of_get_property(np, "port-number", NULL);
-                if ((!of_id) || (*of_id != id))
-                        continue;
-
-                rc = of_address_to_resource(np, 0, &res);
-                if (rc)
-                        continue;
-
-                ulite_ports[id].mapbase = res.start;
-                of_node_put(np);
-                return;
-        }
-}
-#else /* CONFIG_OF */
-static inline void __init ulite_console_of_find_device(int id) { /* do nothing */ }
-#endif /* CONFIG_OF */
-
 static int __init ulite_console_setup(struct console *co, char *options)
 {
         struct uart_port *port;
@@ -414,11 +402,7 @@ static int __init ulite_console_setup(struct console *co, char *options)
 
         port = &ulite_ports[co->index];
 
-        /* Check if it is an OF device */
-        if (!port->mapbase)
-                ulite_console_of_find_device(co->index);
-
-        /* Do we have a device now? */
+        /* Has the device been initialized yet? */
         if (!port->mapbase) {
                 pr_debug("console on ttyUL%i not present\n", co->index);
                 return -ENODEV;
@@ -617,13 +601,6 @@ static int __devexit ulite_of_remove(struct of_device *op)
         return ulite_release(&op->dev);
 }
 
-/* Match table for of_platform binding */
-static struct of_device_id __devinit ulite_of_match[] = {
-        { .type = "serial", .compatible = "xilinx,uartlite", },
-        {},
-};
-MODULE_DEVICE_TABLE(of, ulite_of_match);
-
 static struct of_platform_driver ulite_of_driver = {
         .owner = THIS_MODULE,
         .name = "uartlite",