Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (103 commits)
  powerpc: Fix bug in move of altivec code to vector.S
  powerpc: Add support for swiotlb on 32-bit
  powerpc/spufs: Remove unused error path
  powerpc: Fix warning when printing a resource_size_t
  powerpc/xmon: Remove unused variable in xmon.c
  powerpc/pseries: Fix warnings when printing resource_size_t
  powerpc: Shield code specific to 64-bit server processors
  powerpc: Separate PACA fields for server CPUs
  powerpc: Split exception handling out of head_64.S
  powerpc: Introduce CONFIG_PPC_BOOK3S
  powerpc: Move VMX and VSX asm code to vector.S
  powerpc: Set init_bootmem_done on NUMA platforms as well
  powerpc/mm: Fix a AB->BA deadlock scenario with nohash MMU context lock
  powerpc/mm: Fix some SMP issues with MMU context handling
  powerpc: Add PTRACE_SINGLEBLOCK support
  fbdev: Add PLB support and cleanup DCR in xilinxfb driver.
  powerpc/virtex: Add ml510 reference design device tree
  powerpc/virtex: Add Xilinx ML510 reference design support
  powerpc/virtex: refactor intc driver and add support for i8259 cascading
  powerpc/virtex: Add support for Xilinx PCI host bridge
  ...

9 files changed, 184 insertions, 154 deletions

diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index ffc9254f7e02..042c8149a6d1 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -867,7 +867,7 @@ static int viotape_probe(struct vio_dev *vdev, const struct vio_device_id *id)
         int j;
         struct device_node *node = vdev->dev.archdata.of_node;
 
-        if (i > VIOTAPE_MAX_TAPE)
+        if (i >= VIOTAPE_MAX_TAPE)
                 return -ENODEV;
         if (!node)
                 return -ENODEV;
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index 8b92a4666e02..e4476743f203 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -756,12 +756,12 @@ static int __devinit iic_probe(struct of_device *ofdev,
                 goto error_cleanup;
         }
 
-        /* Now register all the child nodes */
-        of_register_i2c_devices(adap, np);
-
         dev_info(&ofdev->dev, "using %s mode\n",
                  dev->fast_mode ? "fast (400 kHz)" : "standard (100 kHz)");
 
+        /* Now register all the child nodes */
+        of_register_i2c_devices(adap, np);
+
         return 0;
 
 error_cleanup:
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c
index c0621d50c8a0..0ddf9044948a 100644
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -37,6 +37,7 @@
 #define CONFIG_REG   0x40
 #define MANUAL_MASK  0xe0
 #define AUTO_MASK    0x20
+#define INVERT_MASK  0x10
 
 static u8 TEMP_REG[3]    = {0x26, 0x25, 0x27}; /* local, sensor1, sensor2 */
 static u8 LIMIT_REG[3]   = {0x6b, 0x6a, 0x6c}; /* local, sensor1, sensor2 */
@@ -229,7 +230,8 @@ static void write_fan_speed(struct thermostat *th, int speed, int fan)
         
         if (speed >= 0) {
                 manual = read_reg(th, MANUAL_MODE[fan]);
-                write_reg(th, MANUAL_MODE[fan], manual|MANUAL_MASK);
+                write_reg(th, MANUAL_MODE[fan],
+                        (manual|MANUAL_MASK) & (~INVERT_MASK));
                 write_reg(th, FAN_SPD_SET[fan], speed);
         } else {
                 /* back to automatic */
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 44f8392da117..9dd16c9b1a10 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -270,7 +270,7 @@ static int fill_init_enet_entries(struct ucc_geth_private *ugeth,
                                   u8 num_entries,
                                   u32 thread_size,
                                   u32 thread_alignment,
-                                  enum qe_risc_allocation risc,
+                                  unsigned int risc,
                                   int skip_page_for_first_entry)
 {
         u32 init_enet_offset;
@@ -307,7 +307,7 @@ static int fill_init_enet_entries(struct ucc_geth_private *ugeth,
 static int return_init_enet_entries(struct ucc_geth_private *ugeth,
                                     u32 *p_start,
                                     u8 num_entries,
-                                    enum qe_risc_allocation risc,
+                                    unsigned int risc,
                                     int skip_page_for_first_entry)
 {
         u32 init_enet_offset;
@@ -342,7 +342,7 @@ static int dump_init_enet_entries(struct ucc_geth_private *ugeth,
                                   u32 __iomem *p_start,
                                   u8 num_entries,
                                   u32 thread_size,
-                                  enum qe_risc_allocation risc,
+                                  unsigned int risc,
                                   int skip_page_for_first_entry)
 {
         u32 init_enet_offset;
@@ -2135,6 +2135,14 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)
                 return -ENOMEM;
         }
 
+        /* read the number of risc engines, update the riscTx and riscRx
+         * if there are 4 riscs in QE
+         */
+        if (qe_get_num_of_risc() == 4) {
+                ug_info->riscTx = QE_RISC_ALLOCATION_FOUR_RISCS;
+                ug_info->riscRx = QE_RISC_ALLOCATION_FOUR_RISCS;
+        }
+
         ugeth->ug_regs = ioremap(uf_info->regs, sizeof(*ugeth->ug_regs));
         if (!ugeth->ug_regs) {
                 if (netif_msg_probe(ugeth))
@@ -3702,7 +3710,15 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
                 ug_info->uf_info.utfet = UCC_GETH_UTFET_GIGA_INIT;
                 ug_info->uf_info.utftt = UCC_GETH_UTFTT_GIGA_INIT;
                 ug_info->numThreadsTx = UCC_GETH_NUM_OF_THREADS_4;
-                ug_info->numThreadsRx = UCC_GETH_NUM_OF_THREADS_4;
+
+                /* If QE's snum number is 46 which means we need to support
+                 * 4 UECs at 1000Base-T simultaneously, we need to allocate
+                 * more Threads to Rx.
+                 */
+                if (qe_get_num_of_snums() == 46)
+                        ug_info->numThreadsRx = UCC_GETH_NUM_OF_THREADS_6;
+                else
+                        ug_info->numThreadsRx = UCC_GETH_NUM_OF_THREADS_4;
         }
 
         if (netif_msg_probe(&debug))
diff --git a/drivers/net/ucc_geth.h b/drivers/net/ucc_geth.h
index 2f8ee7c87efe..46bb1d233597 100644
--- a/drivers/net/ucc_geth.h
+++ b/drivers/net/ucc_geth.h
@@ -1120,8 +1120,8 @@ struct ucc_geth_info {
         enum ucc_geth_maccfg2_pad_and_crc_mode padAndCrc;
         enum ucc_geth_num_of_threads numThreadsTx;
         enum ucc_geth_num_of_threads numThreadsRx;
-        enum qe_risc_allocation riscTx;
-        enum qe_risc_allocation riscRx;
+        unsigned int riscTx;
+        unsigned int riscRx;
 };
 
 /* structure representing UCC GETH */
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 41c5dfd85358..391f91c0bf55 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -447,6 +447,7 @@ struct of_modalias_table {
 static struct of_modalias_table of_modalias_table[] = {
         { "fsl,mcu-mpc8349emitx", "mcu-mpc8349emitx" },
         { "mmc-spi-slot", "mmc_spi" },
+        { "stm,m25p40", "m25p80" },
 };
 
 /**
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index ba6af162fd39..b77ae6794275 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -39,7 +39,6 @@ obj-$(CONFIG_ALPHA) += setup-bus.o setup-irq.o
 obj-$(CONFIG_ARM) += setup-bus.o setup-irq.o
 obj-$(CONFIG_PARISC) += setup-bus.o
 obj-$(CONFIG_SUPERH) += setup-bus.o setup-irq.o
-obj-$(CONFIG_PPC32) += setup-irq.o
 obj-$(CONFIG_PPC) += setup-bus.o
 obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
 obj-$(CONFIG_X86_VISWS) += setup-irq.o
diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c
index 74d0bfa3f310..3b78540288c7 100644
--- a/drivers/rapidio/rio-scan.c
+++ b/drivers/rapidio/rio-scan.c
@@ -290,7 +290,7 @@ static void __devinit rio_add_device(struct rio_dev *rdev)
  * to a RIO device on success or NULL on failure.
  *
  */
-static struct rio_dev *rio_setup_device(struct rio_net *net,
+static struct rio_dev __devinit *rio_setup_device(struct rio_net *net,
                                         struct rio_mport *port, u16 destid,
                                         u8 hopcount, int do_enum)
 {
@@ -559,7 +559,7 @@ static void rio_net_add_mport(struct rio_net *net, struct rio_mport *port)
  * Recursively enumerates a RIO network.  Transactions are sent via the
  * master port passed in @port.
  */
-static int rio_enum_peer(struct rio_net *net, struct rio_mport *port,
+static int __devinit rio_enum_peer(struct rio_net *net, struct rio_mport *port,
                          u8 hopcount)
 {
         int port_num;
@@ -718,7 +718,7 @@ static int rio_enum_complete(struct rio_mport *port)
  * Recursively discovers a RIO network.  Transactions are sent via the
  * master port passed in @port.
  */
-static int
+static int __devinit
 rio_disc_peer(struct rio_net *net, struct rio_mport *port, u16 destid,
               u8 hopcount)
 {
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index 40a3a2afbfe7..7a868bd16e0e 100644
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -1,13 +1,12 @@
 /*
- * xilinxfb.c
- *
- * Xilinx TFT LCD frame buffer driver
+ * Xilinx TFT frame buffer driver
  *
  * Author: MontaVista Software, Inc.
  *         source@mvista.com
  *
  * 2002-2007 (c) MontaVista Software, Inc.
  * 2007 (c) Secret Lab Technologies, Ltd.
+ * 2009 (c) Xilinx Inc.
  *
  * This file is licensed under the terms of the GNU General Public License
  * version 2.  This program is licensed "as is" without any warranty of any
@@ -24,33 +23,38 @@
 #include <linux/device.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/version.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/dma-mapping.h>
-#include <linux/platform_device.h>
-#if defined(CONFIG_OF)
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
-#endif
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/xilinxfb.h>
+#include <asm/dcr.h>
 
 #define DRIVER_NAME             "xilinxfb"
-#define DRIVER_DESCRIPTION      "Xilinx TFT LCD frame buffer driver"
+
 
 /*
  * Xilinx calls it "PLB TFT LCD Controller" though it can also be used for
- * the VGA port on the Xilinx ML40x board. This is a hardware display controller
- * for a 640x480 resolution TFT or VGA screen.
+ * the VGA port on the Xilinx ML40x board. This is a hardware display
+ * controller for a 640x480 resolution TFT or VGA screen.
  *
  * The interface to the framebuffer is nice and simple.  There are two
  * control registers.  The first tells the LCD interface where in memory
  * the frame buffer is (only the 11 most significant bits are used, so
  * don't start thinking about scrolling).  The second allows the LCD to
  * be turned on or off as well as rotated 180 degrees.
+ *
+ * In case of direct PLB access the second control register will be at
+ * an offset of 4 as compared to the DCR access where the offset is 1
+ * i.e. REG_CTRL. So this is taken care in the function
+ * xilinx_fb_out_be32 where it left shifts the offset 2 times in case of
+ * direct PLB access.
  */
 #define NUM_REGS        2
 #define REG_FB_ADDR     0
@@ -107,17 +111,28 @@ static struct fb_var_screeninfo xilinx_fb_var = {
         .activate =     FB_ACTIVATE_NOW
 };
 
+
+#define PLB_ACCESS_FLAG 0x1             /* 1 = PLB, 0 = DCR */
+
 struct xilinxfb_drvdata {
 
         struct fb_info  info;           /* FB driver info record */
 
-        u32             regs_phys;      /* phys. address of the control registers */
-        u32 __iomem     *regs;          /* virt. address of the control registers */
+        phys_addr_t     regs_phys;      /* phys. address of the control
+                                                registers */
+        void __iomem    *regs;          /* virt. address of the control
+                                                registers */
+
+        dcr_host_t      dcr_host;
+        unsigned int    dcr_start;
+        unsigned int    dcr_len;
 
         void            *fb_virt;       /* virt. address of the frame buffer */
         dma_addr_t      fb_phys;        /* phys. address of the frame buffer */
         int             fb_alloced;     /* Flag, was the fb memory alloced? */
 
+        u8              flags;          /* features of the driver */
+
         u32             reg_ctrl_default;
 
         u32             pseudo_palette[PALETTE_ENTRIES_NO];
@@ -128,14 +143,19 @@ struct xilinxfb_drvdata {
         container_of(_info, struct xilinxfb_drvdata, info)
 
 /*
- * The LCD controller has DCR interface to its registers, but all
- * the boards and configurations the driver has been tested with
- * use opb2dcr bridge. So the registers are seen as memory mapped.
- * This macro is to make it simple to add the direct DCR access
- * when it's needed.
+ * The XPS TFT Controller can be accessed through PLB or DCR interface.
+ * To perform the read/write on the registers we need to check on
+ * which bus its connected and call the appropriate write API.
  */
-#define xilinx_fb_out_be32(driverdata, offset, val) \
-        out_be32(driverdata->regs + offset, val)
+static void xilinx_fb_out_be32(struct xilinxfb_drvdata *drvdata, u32 offset,
+                                u32 val)
+{
+        if (drvdata->flags & PLB_ACCESS_FLAG)
+                out_be32(drvdata->regs + (offset << 2), val);
+        else
+                dcr_write(drvdata->dcr_host, offset, val);
+
+}
 
 static int
 xilinx_fb_setcolreg(unsigned regno, unsigned red, unsigned green, unsigned blue,
@@ -203,35 +223,34 @@ static struct fb_ops xilinxfb_ops =
  * Bus independent setup/teardown
  */
 
-static int xilinxfb_assign(struct device *dev, unsigned long physaddr,
+static int xilinxfb_assign(struct device *dev,
+                           struct xilinxfb_drvdata *drvdata,
+                           unsigned long physaddr,
                            struct xilinxfb_platform_data *pdata)
 {
-        struct xilinxfb_drvdata *drvdata;
         int rc;
         int fbsize = pdata->xvirt * pdata->yvirt * BYTES_PER_PIXEL;
 
-        /* Allocate the driver data region */
-        drvdata = kzalloc(sizeof(*drvdata), GFP_KERNEL);
-        if (!drvdata) {
-                dev_err(dev, "Couldn't allocate device private record\n");
-                return -ENOMEM;
-        }
-        dev_set_drvdata(dev, drvdata);
-
-        /* Map the control registers in */
-        if (!request_mem_region(physaddr, 8, DRIVER_NAME)) {
-                dev_err(dev, "Couldn't lock memory region at 0x%08lX\n",
-                        physaddr);
-                rc = -ENODEV;
-                goto err_region;
-        }
-        drvdata->regs_phys = physaddr;
-        drvdata->regs = ioremap(physaddr, 8);
-        if (!drvdata->regs) {
-                dev_err(dev, "Couldn't lock memory region at 0x%08lX\n",
-                        physaddr);
-                rc = -ENODEV;
-                goto err_map;
+        if (drvdata->flags & PLB_ACCESS_FLAG) {
+                /*
+                 * Map the control registers in if the controller
+                 * is on direct PLB interface.
+                 */
+                if (!request_mem_region(physaddr, 8, DRIVER_NAME)) {
+                        dev_err(dev, "Couldn't lock memory region at 0x%08lX\n",
+                                physaddr);
+                        rc = -ENODEV;
+                        goto err_region;
+                }
+
+                drvdata->regs_phys = physaddr;
+                drvdata->regs = ioremap(physaddr, 8);
+                if (!drvdata->regs) {
+                        dev_err(dev, "Couldn't lock memory region at 0x%08lX\n",
+                                physaddr);
+                        rc = -ENODEV;
+                        goto err_map;
+                }
         }
 
         /* Allocate the framebuffer memory */
@@ -247,7 +266,10 @@ static int xilinxfb_assign(struct device *dev, unsigned long physaddr,
         if (!drvdata->fb_virt) {
                 dev_err(dev, "Could not allocate frame buffer memory\n");
                 rc = -ENOMEM;
-                goto err_fbmem;
+                if (drvdata->flags & PLB_ACCESS_FLAG)
+                        goto err_fbmem;
+                else
+                        goto err_region;
         }
 
         /* Clear (turn to black) the framebuffer */
@@ -260,7 +282,8 @@ static int xilinxfb_assign(struct device *dev, unsigned long physaddr,
         drvdata->reg_ctrl_default = REG_CTRL_ENABLE;
         if (pdata->rotate_screen)
                 drvdata->reg_ctrl_default |= REG_CTRL_ROTATE;
-        xilinx_fb_out_be32(drvdata, REG_CTRL, drvdata->reg_ctrl_default);
+        xilinx_fb_out_be32(drvdata, REG_CTRL,
+                                        drvdata->reg_ctrl_default);
 
         /* Fill struct fb_info */
         drvdata->info.device = dev;
@@ -296,11 +319,14 @@ static int xilinxfb_assign(struct device *dev, unsigned long physaddr,
                 goto err_regfb;
         }
 
+        if (drvdata->flags & PLB_ACCESS_FLAG) {
+                /* Put a banner in the log (for DEBUG) */
+                dev_dbg(dev, "regs: phys=%lx, virt=%p\n", physaddr,
+                                        drvdata->regs);
+        }
         /* Put a banner in the log (for DEBUG) */
-        dev_dbg(dev, "regs: phys=%lx, virt=%p\n", physaddr, drvdata->regs);
-        dev_dbg(dev, "fb: phys=%llx, virt=%p, size=%x\n",
-                (unsigned long long) drvdata->fb_phys, drvdata->fb_virt,
-                fbsize);
+        dev_dbg(dev, "fb: phys=%p, virt=%p, size=%x\n",
+                (void *)drvdata->fb_phys, drvdata->fb_virt, fbsize);
 
         return 0;       /* success */
 
@@ -311,14 +337,19 @@ err_cmap:
         if (drvdata->fb_alloced)
                 dma_free_coherent(dev, PAGE_ALIGN(fbsize), drvdata->fb_virt,
                         drvdata->fb_phys);
+        else
+                iounmap(drvdata->fb_virt);
+
         /* Turn off the display */
         xilinx_fb_out_be32(drvdata, REG_CTRL, 0);
 
 err_fbmem:
-        iounmap(drvdata->regs);
+        if (drvdata->flags & PLB_ACCESS_FLAG)
+                iounmap(drvdata->regs);
 
 err_map:
-        release_mem_region(physaddr, 8);
+        if (drvdata->flags & PLB_ACCESS_FLAG)
+                release_mem_region(physaddr, 8);
 
 err_region:
         kfree(drvdata);
@@ -342,12 +373,18 @@ static int xilinxfb_release(struct device *dev)
         if (drvdata->fb_alloced)
                 dma_free_coherent(dev, PAGE_ALIGN(drvdata->info.fix.smem_len),
                                   drvdata->fb_virt, drvdata->fb_phys);
+        else
+                iounmap(drvdata->fb_virt);
 
         /* Turn off the display */
         xilinx_fb_out_be32(drvdata, REG_CTRL, 0);
-        iounmap(drvdata->regs);
 
-        release_mem_region(drvdata->regs_phys, 8);
+        /* Release the resources, as allocated based on interface */
+        if (drvdata->flags & PLB_ACCESS_FLAG) {
+                iounmap(drvdata->regs);
+                release_mem_region(drvdata->regs_phys, 8);
+        } else
+                dcr_unmap(drvdata->dcr_host, drvdata->dcr_len);
 
         kfree(drvdata);
         dev_set_drvdata(dev, NULL);
@@ -356,77 +393,57 @@ static int xilinxfb_release(struct device *dev)
 }
 
 /* ---------------------------------------------------------------------
- * Platform bus binding
- */
-
-static int
-xilinxfb_platform_probe(struct platform_device *pdev)
-{
-        struct xilinxfb_platform_data *pdata;
-        struct resource *res;
-
-        /* Find the registers address */
-        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
-        if (!res) {
-                dev_err(&pdev->dev, "Couldn't get registers resource\n");
-                return -ENODEV;
-        }
-
-        /* If a pdata structure is provided, then extract the parameters */
-        pdata = &xilinx_fb_default_pdata;
-        if (pdev->dev.platform_data) {
-                pdata = pdev->dev.platform_data;
-                if (!pdata->xres)
-                        pdata->xres = xilinx_fb_default_pdata.xres;
-                if (!pdata->yres)
-                        pdata->yres = xilinx_fb_default_pdata.yres;
-                if (!pdata->xvirt)
-                        pdata->xvirt = xilinx_fb_default_pdata.xvirt;
-                if (!pdata->yvirt)
-                        pdata->yvirt = xilinx_fb_default_pdata.yvirt;
-        }
-
-        return xilinxfb_assign(&pdev->dev, res->start, pdata);
-}
-
-static int
-xilinxfb_platform_remove(struct platform_device *pdev)
-{
-        return xilinxfb_release(&pdev->dev);
-}
-
-
-static struct platform_driver xilinxfb_platform_driver = {
-        .probe          = xilinxfb_platform_probe,
-        .remove         = xilinxfb_platform_remove,
-        .driver = {
-                .owner = THIS_MODULE,
-                .name = DRIVER_NAME,
-        },
-};
-
-/* ---------------------------------------------------------------------
  * OF bus binding
  */
 
-#if defined(CONFIG_OF)
 static int __devinit
 xilinxfb_of_probe(struct of_device *op, const struct of_device_id *match)
 {
-        struct resource res;
         const u32 *prop;
+        u32 *p;
+        u32 tft_access;
         struct xilinxfb_platform_data pdata;
+        struct resource res;
         int size, rc;
+        int start = 0, len = 0;
+        dcr_host_t dcr_host;
+        struct xilinxfb_drvdata *drvdata;
 
         /* Copy with the default pdata (not a ptr reference!) */
         pdata = xilinx_fb_default_pdata;
 
         dev_dbg(&op->dev, "xilinxfb_of_probe(%p, %p)\n", op, match);
 
-        rc = of_address_to_resource(op->node, 0, &res);
-        if (rc) {
-                dev_err(&op->dev, "invalid address\n");
-                return rc;
+        /*
+         * To check whether the core is connected directly to DCR or PLB
+         * interface and initialize the tft_access accordingly.
+         */
+        p = (u32 *)of_get_property(op->node, "xlnx,dcr-splb-slave-if", NULL);
+
+        if (p)
+                tft_access = *p;
+        else
+                tft_access = 0;         /* For backward compatibility */
+
+        /*
+         * Fill the resource structure if its direct PLB interface
+         * otherwise fill the dcr_host structure.
+         */
+        if (tft_access) {
+                rc = of_address_to_resource(op->node, 0, &res);
+                if (rc) {
+                        dev_err(&op->dev, "invalid address\n");
+                        return -ENODEV;
+                }
+
+        } else {
+                start = dcr_resource_start(op->node, 0);
+                len = dcr_resource_len(op->node, 0);
+                dcr_host = dcr_map(op->node, start, len);
+                if (!DCR_MAP_OK(dcr_host)) {
+                        dev_err(&op->dev, "invalid address\n");
+                        return -ENODEV;
+                }
         }
 
         prop = of_get_property(op->node, "phys-size", &size);
@@ -450,7 +467,26 @@ xilinxfb_of_probe(struct of_device *op, const struct of_device_id *match)
         if (of_find_property(op->node, "rotate-display", NULL))
                 pdata.rotate_screen = 1;
 
-        return xilinxfb_assign(&op->dev, res.start, &pdata);
+        /* Allocate the driver data region */
+        drvdata = kzalloc(sizeof(*drvdata), GFP_KERNEL);
+        if (!drvdata) {
+                dev_err(&op->dev, "Couldn't allocate device private record\n");
+                return -ENOMEM;
+        }
+        dev_set_drvdata(&op->dev, drvdata);
+
+        if (tft_access)
+                drvdata->flags |= PLB_ACCESS_FLAG;
+
+        /* Arguments are passed based on the interface */
+        if (drvdata->flags & PLB_ACCESS_FLAG) {
+                return xilinxfb_assign(&op->dev, drvdata, res.start, &pdata);
+        } else {
+                drvdata->dcr_start = start;
+                drvdata->dcr_len = len;
+                drvdata->dcr_host = dcr_host;
+                return xilinxfb_assign(&op->dev, drvdata, 0, &pdata);
+        }
 }
 
 static int __devexit xilinxfb_of_remove(struct of_device *op)
@@ -460,7 +496,9 @@ 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 = "xlnx,xps-tft-1.00.a", },
         { .compatible = "xlnx,plb-tft-cntlr-ref-1.00.a", },
+        { .compatible = "xlnx,plb-dvi-cntlr-ref-1.00.c", },
         {},
 };
 MODULE_DEVICE_TABLE(of, xilinxfb_of_match);
@@ -476,22 +514,6 @@ static struct of_platform_driver xilinxfb_of_driver = {
         },
 };
 
-/* Registration helpers to keep the number of #ifdefs to a minimum */
-static inline int __init xilinxfb_of_register(void)
-{
-        pr_debug("xilinxfb: calling of_register_platform_driver()\n");
-        return of_register_platform_driver(&xilinxfb_of_driver);
-}
-
-static inline void __exit xilinxfb_of_unregister(void)
-{
-        of_unregister_platform_driver(&xilinxfb_of_driver);
-}
-#else /* CONFIG_OF */
-/* CONFIG_OF not enabled; do nothing helpers */
-static inline int __init xilinxfb_of_register(void) { return 0; }
-static inline void __exit xilinxfb_of_unregister(void) { }
-#endif /* CONFIG_OF */
 
 /* ---------------------------------------------------------------------
  * Module setup and teardown
@@ -500,28 +522,18 @@ static inline void __exit xilinxfb_of_unregister(void) { }
 static int __init
 xilinxfb_init(void)
 {
-        int rc;
-        rc = xilinxfb_of_register();
-        if (rc)
-                return rc;
-
-        rc = platform_driver_register(&xilinxfb_platform_driver);
-        if (rc)
-                xilinxfb_of_unregister();
-
-        return rc;
+        return of_register_platform_driver(&xilinxfb_of_driver);
 }
 
 static void __exit
 xilinxfb_cleanup(void)
 {
-        platform_driver_unregister(&xilinxfb_platform_driver);
-        xilinxfb_of_unregister();
+        of_unregister_platform_driver(&xilinxfb_of_driver);
 }
 
 module_init(xilinxfb_init);
 module_exit(xilinxfb_cleanup);
 
 MODULE_AUTHOR("MontaVista Software, Inc. <source@mvista.com>");
-MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
+MODULE_DESCRIPTION("Xilinx TFT frame buffer driver");
 MODULE_LICENSE("GPL");