Merge tag 'fbdev-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj...

Pull fbdev update from Jean-Christophe PLAGNIOL-VILLARD:
 "Various fbdev changes for 3.11
   - xilinxfb updates
   - Small cleanups and fixes to multiple drivers
   - OMAP display subsystem bug updates
   - imxfb dt support"

* tag 'fbdev-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev: (95 commits)
  video: imxfb: Add DT support
  video: i740fb: Make i740fb_init static
  fb: make fp_get_options name argument const
  video: mmp: fix graphics/video layer enable/mask swap issue
  video: mmp: fix memcpy wrong size for mmp_addr issue
  radeon: use pdev->pm_cap instead of pci_find_capability(..,PCI_CAP_ID_PM)
  aty128fb: use pdev->pm_cap instead of pci_find_capability(..,PCI_CAP_ID_PM)
  video: of_display_timing.h: Declare 'display_timing'
  fbdev: bfin-lq035q1-fb: Use dev_pm_ops
  fbmem: return -EFAULT on copy_to_user() failure
  OMAPDSS: DPI: Fix wrong pixel clock limit
  video: replace strict_strtoul() with kstrtoul()
  uvesafb: Correct/simplify warning message
  fb: fix atyfb unused data warnings
  fb: fix atyfb build warning
  video: imxfb: Make local symbols static
  video: udlfb: Make local symbol static
  video: udlfb: Use NULL instead of 0
  video: smscufx: Use NULL instead of 0
  video: remove unnecessary platform_set_drvdata()
  ...

diff --combined drivers/video/au1100fb.c
index ebeb9715f0616fd87071f4a1e6f858c65a7662f1,606a3babe7920ec7c2a4571f14e0151247ac33f3..a54ccdc4d6618bf4bdcfd5202f3e8489f22cec34
--- 1/drivers/video/au1100fb.c
--- 2/drivers/video/au1100fb.c
+++ b/drivers/video/au1100fb.c
@@@ -385,6 -385,8 +385,6 @@@ int au1100fb_fb_mmap(struct fb_info *fb
        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
        pgprot_val(vma->vm_page_prot) |= (6 << 9); //CCA=6
  
 -      vma->vm_flags |= VM_IO;
 -
        if (io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
                                vma->vm_end - vma->vm_start,
                                vma->vm_page_prot)) {
@@@ -577,7 -579,6 +577,6 @@@ failed
        if (fbdev->info.cmap.len != 0) {
                fb_dealloc_cmap(&fbdev->info.cmap);
        }
-       platform_set_drvdata(dev, NULL);
  
        return -ENODEV;
  }

diff --combined drivers/video/omap2/displays/panel-n8x0.c
index 860b18014ad750c75653c6f5ccca3fc3cf8da0d6,d3860c50d3f992b81239c44a9f7bc8b651018e9e..1d525fc84db959894dce439899f1517b7c96b0ac
--- 1/drivers/video/omap2/displays/panel-n8x0.c
--- 2/drivers/video/omap2/displays/panel-n8x0.c
+++ b/drivers/video/omap2/displays/panel-n8x0.c
@@@ -311,16 -311,16 +311,16 @@@ static int n8x0_panel_power_on(struct o
        switch (rev & 0xfc) {
        case 0x9c:
                ddata->blizzard_ver = BLIZZARD_VERSION_S1D13744;
-               dev_info(&dssdev->dev, "s1d13744 LCD controller rev %d "
+               dev_info(dssdev->dev, "s1d13744 LCD controller rev %d "
                        "initialized (CNF pins %x)\n", rev & 0x03, conf & 0x07);
                break;
        case 0xa4:
                ddata->blizzard_ver = BLIZZARD_VERSION_S1D13745;
-               dev_info(&dssdev->dev, "s1d13745 LCD controller rev %d "
+               dev_info(dssdev->dev, "s1d13745 LCD controller rev %d "
                        "initialized (CNF pins %x)\n", rev & 0x03, conf & 0x07);
                break;
        default:
-               dev_err(&dssdev->dev, "invalid s1d1374x revision %02x\n", rev);
+               dev_err(dssdev->dev, "invalid s1d1374x revision %02x\n", rev);
                r = -ENODEV;
                goto err_inv_chip;
        }
@@@ -341,13 -341,13 +341,13 @@@
                panel_name = "ls041y3";
                break;
        default:
-               dev_err(&dssdev->dev, "invalid display ID 0x%x\n",
+               dev_err(dssdev->dev, "invalid display ID 0x%x\n",
                                display_id[0]);
                r = -ENODEV;
                goto err_inv_panel;
        }
  
-       dev_info(&dssdev->dev, "%s rev %02x LCD detected\n",
+       dev_info(dssdev->dev, "%s rev %02x LCD detected\n",
                        panel_name, display_id[1]);
  
        send_sleep_out(spi);
@@@ -416,7 -416,7 +416,7 @@@ static int n8x0_panel_probe(struct omap
        struct panel_drv_data *ddata;
        int r;
  
-       dev_dbg(&dssdev->dev, "probe\n");
+       dev_dbg(dssdev->dev, "probe\n");
  
        if (!bdata)
                return -EINVAL;
@@@ -434,14 -434,14 +434,14 @@@
        dssdev->caps = OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE;
  
        if (gpio_is_valid(bdata->panel_reset)) {
-               r = devm_gpio_request_one(&dssdev->dev, bdata->panel_reset,
+               r = devm_gpio_request_one(dssdev->dev, bdata->panel_reset,
                                GPIOF_OUT_INIT_LOW, "PANEL RESET");
                if (r)
                        return r;
        }
  
        if (gpio_is_valid(bdata->ctrl_pwrdown)) {
-               r = devm_gpio_request_one(&dssdev->dev, bdata->ctrl_pwrdown,
+               r = devm_gpio_request_one(dssdev->dev, bdata->ctrl_pwrdown,
                                GPIOF_OUT_INIT_LOW, "PANEL PWRDOWN");
                if (r)
                        return r;
@@@ -452,9 -452,9 +452,9 @@@
  
  static void n8x0_panel_remove(struct omap_dss_device *dssdev)
  {
-       dev_dbg(&dssdev->dev, "remove\n");
+       dev_dbg(dssdev->dev, "remove\n");
  
-       dev_set_drvdata(&dssdev->dev, NULL);
+       dev_set_drvdata(dssdev->dev, NULL);
  }
  
  static int n8x0_panel_enable(struct omap_dss_device *dssdev)
@@@ -462,7 -462,7 +462,7 @@@
        struct panel_drv_data *ddata = get_drv_data(dssdev);
        int r;
  
-       dev_dbg(&dssdev->dev, "enable\n");
+       dev_dbg(dssdev->dev, "enable\n");
  
        mutex_lock(&ddata->lock);
  
@@@ -488,7 -488,7 +488,7 @@@ static void n8x0_panel_disable(struct o
  {
        struct panel_drv_data *ddata = get_drv_data(dssdev);
  
-       dev_dbg(&dssdev->dev, "disable\n");
+       dev_dbg(dssdev->dev, "disable\n");
  
        mutex_lock(&ddata->lock);
  
@@@ -521,13 -521,13 +521,13 @@@ static int n8x0_panel_update(struct oma
        struct panel_drv_data *ddata = get_drv_data(dssdev);
        u16 dw, dh;
  
-       dev_dbg(&dssdev->dev, "update\n");
+       dev_dbg(dssdev->dev, "update\n");
  
        dw = dssdev->panel.timings.x_res;
        dh = dssdev->panel.timings.y_res;
  
        if (x != 0 || y != 0 || w != dw || h != dh) {
-               dev_err(&dssdev->dev, "invalid update region %d, %d, %d, %d\n",
 -              dev_err(dssdev->dev, "invaid update region %d, %d, %d, %d\n",
++              dev_err(dssdev->dev, "invalid update region %d, %d, %d, %d\n",
                        x, y, w, h);
                return -EINVAL;
        }
@@@ -548,7 -548,7 +548,7 @@@ static int n8x0_panel_sync(struct omap_
  {
        struct panel_drv_data *ddata = get_drv_data(dssdev);
  
-       dev_dbg(&dssdev->dev, "sync\n");
+       dev_dbg(dssdev->dev, "sync\n");
  
        mutex_lock(&ddata->lock);
        rfbi_bus_lock();

diff --combined drivers/video/pxa3xx-gcu.c
index 7cf0b13d061b624192c35092073963b641b41c52,95c3c4ae81cc7dc0fc6904c53e0b9ab0828395cc..ad382b3396cdb126aad44aa4499d585fcdfe9e44
--- 1/drivers/video/pxa3xx-gcu.c
--- 2/drivers/video/pxa3xx-gcu.c
+++ b/drivers/video/pxa3xx-gcu.c
@@@ -494,6 -494,7 +494,6 @@@ pxa3xx_gcu_misc_mmap(struct file *file
                if (size != resource_size(priv->resource_mem))
                        return -EINVAL;
  
 -              vma->vm_flags |= VM_IO;
                vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
  
                return io_remap_pfn_range(vma, vma->vm_start,
@@@ -710,7 -711,6 +710,6 @@@ err_misc_deregister
        misc_deregister(&priv->misc_dev);
  
  err_free_priv:
-       platform_set_drvdata(dev, NULL);
        free_buffers(dev, priv);
        kfree(priv);
        return ret;
@@@ -728,7 -728,6 +727,6 @@@ static int pxa3xx_gcu_remove(struct pla
                        priv->shared, priv->shared_phys);
        iounmap(priv->mmio_base);
        release_mem_region(r->start, resource_size(r));
-       platform_set_drvdata(dev, NULL);
        clk_disable(priv->clk);
        free_buffers(dev, priv);
        kfree(priv);