[POWERPC] XilinxFB: cleanup platform_bus binding to use platform bus API.
[pandora-kernel.git] / drivers / video / xilinxfb.c
index 6ef9733..e482bb5 100644 (file)
@@ -18,6 +18,7 @@
  * Geert Uytterhoeven.
  */
 
+#include <linux/device.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/version.h>
@@ -30,7 +31,7 @@
 #include <linux/platform_device.h>
 
 #include <asm/io.h>
-#include <syslib/virtex_devices.h>
+#include <linux/xilinxfb.h>
 
 #define DRIVER_NAME            "xilinxfb"
 #define DRIVER_DESCRIPTION     "Xilinx TFT LCD frame buffer driver"
@@ -195,66 +196,58 @@ static struct fb_ops xilinxfb_ops =
        .fb_imageblit           = cfb_imageblit,
 };
 
-/* === The device driver === */
+/* ---------------------------------------------------------------------
+ * Bus independent setup/teardown
+ */
 
-static int
-xilinxfb_drv_probe(struct device *dev)
+static int xilinxfb_assign(struct device *dev, unsigned long physaddr,
+                          int width_mm, int height_mm, int rotate)
 {
-       struct platform_device *pdev;
-       struct xilinxfb_platform_data *pdata;
        struct xilinxfb_drvdata *drvdata;
-       struct resource *regs_res;
-       int retval;
-
-       if (!dev)
-               return -EINVAL;
-
-       pdev = to_platform_device(dev);
-       pdata = pdev->dev.platform_data;
+       int rc;
 
+       /* Allocate the driver data region */
        drvdata = kzalloc(sizeof(*drvdata), GFP_KERNEL);
        if (!drvdata) {
-               printk(KERN_ERR "Couldn't allocate device private record\n");
+               dev_err(dev, "Couldn't allocate device private record\n");
                return -ENOMEM;
        }
        dev_set_drvdata(dev, drvdata);
 
        /* Map the control registers in */
-       regs_res = platform_get_resource(pdev, IORESOURCE_IO, 0);
-       if (!regs_res || (regs_res->end - regs_res->start + 1 < 8)) {
-               printk(KERN_ERR "Couldn't get registers resource\n");
-               retval = -EFAULT;
-               goto failed1;
+       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;
        }
-
-       if (!request_mem_region(regs_res->start, 8, DRIVER_NAME)) {
-               printk(KERN_ERR
-                      "Couldn't lock memory region at 0x%08X\n",
-                      regs_res->start);
-               retval = -EBUSY;
-               goto failed1;
+       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;
        }
-       drvdata->regs = (u32 __iomem*) ioremap(regs_res->start, 8);
-       drvdata->regs_phys = regs_res->start;
 
        /* Allocate the framebuffer memory */
        drvdata->fb_virt = dma_alloc_coherent(dev, PAGE_ALIGN(FB_SIZE),
                                &drvdata->fb_phys, GFP_KERNEL);
        if (!drvdata->fb_virt) {
-               printk(KERN_ERR "Could not allocate frame buffer memory\n");
-               retval = -ENOMEM;
-               goto failed2;
+               dev_err(dev, "Could not allocate frame buffer memory\n");
+               rc = -ENOMEM;
+               goto err_fbmem;
        }
 
        /* Clear (turn to black) the framebuffer */
-       memset_io((void *) drvdata->fb_virt, 0, FB_SIZE);
+       memset_io(drvdata->fb_virt, 0, FB_SIZE);
 
        /* Tell the hardware where the frame buffer is */
        xilinx_fb_out_be32(drvdata, REG_FB_ADDR, drvdata->fb_phys);
 
        /* Turn on the display */
        drvdata->reg_ctrl_default = REG_CTRL_ENABLE;
-       if (pdata && pdata->rotate_screen)
+       if (rotate)
                drvdata->reg_ctrl_default |= REG_CTRL_ROTATE;
        xilinx_fb_out_be32(drvdata, REG_CTRL, drvdata->reg_ctrl_default);
 
@@ -265,60 +258,58 @@ xilinxfb_drv_probe(struct device *dev)
        drvdata->info.fix = xilinx_fb_fix;
        drvdata->info.fix.smem_start = drvdata->fb_phys;
        drvdata->info.pseudo_palette = drvdata->pseudo_palette;
+       drvdata->info.flags = FBINFO_DEFAULT;
+       drvdata->info.var = xilinx_fb_var;
 
-       if (fb_alloc_cmap(&drvdata->info.cmap, PALETTE_ENTRIES_NO, 0) < 0) {
-               printk(KERN_ERR "Fail to allocate colormap (%d entries)\n",
-                       PALETTE_ENTRIES_NO);
-               retval = -EFAULT;
-               goto failed3;
-       }
+       xilinx_fb_var.height = height_mm;
+       xilinx_fb_var.width = width_mm;
 
-       drvdata->info.flags = FBINFO_DEFAULT;
-       if (pdata) {
-               xilinx_fb_var.height = pdata->screen_height_mm;
-               xilinx_fb_var.width = pdata->screen_width_mm;
+       /* Allocate a colour map */
+       rc = fb_alloc_cmap(&drvdata->info.cmap, PALETTE_ENTRIES_NO, 0);
+       if (rc) {
+               dev_err(dev, "Fail to allocate colormap (%d entries)\n",
+                       PALETTE_ENTRIES_NO);
+               goto err_cmap;
        }
-       drvdata->info.var = xilinx_fb_var;
 
        /* Register new frame buffer */
-       if (register_framebuffer(&drvdata->info) < 0) {
-               printk(KERN_ERR "Could not register frame buffer\n");
-               retval = -EINVAL;
-               goto failed4;
+       rc = register_framebuffer(&drvdata->info);
+       if (rc) {
+               dev_err(dev, "Could not register frame buffer\n");
+               goto err_regfb;
        }
 
+       /* 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=%p, virt=%p, size=%x\n",
+               (void*)drvdata->fb_phys, drvdata->fb_virt, FB_SIZE);
        return 0;       /* success */
 
-failed4:
+err_regfb:
        fb_dealloc_cmap(&drvdata->info.cmap);
 
-failed3:
+err_cmap:
        dma_free_coherent(dev, PAGE_ALIGN(FB_SIZE), drvdata->fb_virt,
                drvdata->fb_phys);
-
        /* Turn off the display */
        xilinx_fb_out_be32(drvdata, REG_CTRL, 0);
+
+err_fbmem:
        iounmap(drvdata->regs);
 
-failed2:
-       release_mem_region(regs_res->start, 8);
+err_map:
+       release_mem_region(physaddr, 8);
 
-failed1:
+err_region:
        kfree(drvdata);
        dev_set_drvdata(dev, NULL);
 
-       return retval;
+       return rc;
 }
 
-static int
-xilinxfb_drv_remove(struct device *dev)
+static int xilinxfb_release(struct device *dev)
 {
-       struct xilinxfb_drvdata *drvdata;
-
-       if (!dev)
-               return -ENODEV;
-
-       drvdata = (struct xilinxfb_drvdata *) dev_get_drvdata(dev);
+       struct xilinxfb_drvdata *drvdata = dev_get_drvdata(dev);
 
 #if !defined(CONFIG_FRAMEBUFFER_CONSOLE) && defined(CONFIG_LOGO)
        xilinx_fb_blank(VESA_POWERDOWN, &drvdata->info);
@@ -343,13 +334,54 @@ xilinxfb_drv_remove(struct device *dev)
        return 0;
 }
 
+/* ---------------------------------------------------------------------
+ * Platform bus binding
+ */
+
+static int
+xilinxfb_platform_probe(struct platform_device *pdev)
+{
+       struct xilinxfb_platform_data *pdata;
+       struct resource *res;
+       int width_mm;
+       int height_mm;
+       int rotate;
+
+       pdata = pdev->dev.platform_data;
+       if (!pdata) {
+               dev_err(&pdev->dev, "Missing pdata structure\n");
+               return -ENODEV;
+       }
+
+       /* 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;
+       }
+
+       height_mm = pdata->screen_height_mm;
+       width_mm = pdata->screen_width_mm;
+       rotate = pdata->rotate_screen ? 1 : 0;
+
+       return xilinxfb_assign(&pdev->dev, res->start, width_mm, height_mm,
+                              rotate);
+}
+
+static int
+xilinxfb_platform_remove(struct platform_device *pdev)
+{
+       return xilinxfb_release(&pdev->dev);
+}
 
-static struct device_driver xilinxfb_driver = {
-       .name           = DRIVER_NAME,
-       .bus            = &platform_bus_type,
 
-       .probe          = xilinxfb_drv_probe,
-       .remove         = xilinxfb_drv_remove
+static struct platform_driver xilinxfb_platform_driver = {
+       .probe          = xilinxfb_platform_probe,
+       .remove         = xilinxfb_platform_remove,
+       .driver = {
+               .owner = THIS_MODULE,
+               .name = DRIVER_NAME,
+       },
 };
 
 static int __init
@@ -359,13 +391,13 @@ xilinxfb_init(void)
         * No kernel boot options used,
         * so we just need to register the driver
         */
-       return driver_register(&xilinxfb_driver);
+       return platform_driver_register(&xilinxfb_platform_driver);
 }
 
 static void __exit
 xilinxfb_cleanup(void)
 {
-       driver_unregister(&xilinxfb_driver);
+       platform_driver_unregister(&xilinxfb_platform_driver);
 }
 
 module_init(xilinxfb_init);