4 files changed, 20 insertions, 11 deletions

diff --git a/arch/powerpc/platforms/40x/virtex.c b/arch/powerpc/platforms/40x/virtex.c
index 88b66444dfb2..0422590040db 100644
--- a/arch/powerpc/platforms/40x/virtex.c
+++ b/arch/powerpc/platforms/40x/virtex.c
@@ -37,7 +37,7 @@ static int __init virtex_probe(void)
 {
         unsigned long root = of_get_flat_dt_root();
 
-        if (!of_flat_dt_is_compatible(root, "xilinx,virtex"))
+        if (!of_flat_dt_is_compatible(root, "xlnx,virtex"))
                 return 0;
 
         return 1;
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index 1110e1b60712..4a7a059ebaf7 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -1203,7 +1203,9 @@ static int __devexit ace_of_remove(struct of_device *op)
 
 /* Match table for of_platform binding */
 static struct of_device_id ace_of_match[] __devinitdata = {
-        { .compatible = "xilinx,xsysace", },
+        { .compatible = "xlnx,opb-sysace-1.00.b", },
+        { .compatible = "xlnx,opb-sysace-1.00.c", },
+        { .compatible = "xlnx,xps-sysace-1.00.a", },
         {},
 };
 MODULE_DEVICE_TABLE(of, ace_of_match);
diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c
index c54a5ad992b1..b22023f1ec6b 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;
@@ -383,7 +397,7 @@ static inline void __init ulite_console_of_find_device(int id)
         const unsigned int *of_id;
         int rc;
 
-        for_each_compatible_node(np, NULL, "xilinx,uartlite") {
+        for_each_matching_node(np, ulite_of_match) {
                 of_id = of_get_property(np, "port-number", NULL);
                 if ((!of_id) || (*of_id != id))
                         continue;
@@ -617,13 +631,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 ulite_of_match[] __devinitdata = {
-        { .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",
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index c92e99eced29..7b3a8423f485 100644
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -460,7 +460,7 @@ static int __devexit xilinxfb_of_remove(struct of_device *op)
 
 /* Match table for of_platform binding */
 static struct of_device_id xilinxfb_of_match[] __devinitdata = {
-        { .compatible = "xilinx,ml300-fb", },
+        { .compatible = "xlnx,plb-tft-cntlr-ref-1.00.a", },
         {},
 };
 MODULE_DEVICE_TABLE(of, xilinxfb_of_match);