Merge tag 'fbdev-updates-for-3.6' of git://github.com/schandinat/linux-2.6

Pull fbdev updates from Florian Tobias Schandinat:
 - large updates for OMAP
   - support for LCD3 overlay manager (omap5)
   - omapdss output cleanup
   - removal of passive matrix LCD support as there are no drivers for
     such panels for DSS or DSS2 and nobody complained (cleanup)
 - large updates for SH Mobile
   - overlay support
   - separating MERAM (cache) from framebuffer driver
 - some updates for Exynos and da8xx-fb
 - various other small patches

* tag 'fbdev-updates-for-3.6' of git://github.com/schandinat/linux-2.6: (78 commits)
  da8xx-fb: fix compile issue due to missing include
  fbdev: Make pixel_to_pat() failure mode more friendly
  da8xx-fb: do not turn ON LCD backlight unless LCDC is enabled
  fbdev: sh_mobile_lcdc: Fix vertical panning step
  video: exynos mipi dsi: Fix mipi dsi regulators handling issue
  video: da8xx-fb: do clock reset of revision 2 LCDC before enabling
  arm: da850: configure LCDC fifo threshold
  video: da8xx-fb: configure FIFO threshold to reduce underflow errors
  video: da8xx-fb: fix flicker due to 1 frame delay in updated frame
  video: da8xx-fb rev2: fix disabling of palette completion interrupt
  da8xx-fb: add missing FB_BLANK operations
  video: exynos_dp: use usleep_range instead of delay
  video: exynos_dp: check the only INTERLANE_ALIGN_DONE bit during Link Training
  fb: epson1355fb: Fix section mismatch
  video: exynos_dp: fix wrong DPCD address during Link Training
  video/smscufx: fix line counting in fb_write
  aty128fb: Fix coding style issues
  fbdev: sh_mobile_lcdc: Fix pan offset computation in YUV mode
  fbdev: sh_mobile_lcdc: Fix overlay registers update during pan operation
  fbdev: sh_mobile_lcdc: Support horizontal panning
  ...

diff --combined drivers/video/exynos/exynos_dp_reg.c
index bcb0e3ae1e9d7a708803696cc9fe040fbdb86d0c,ce401c83f6388f100cfb24524471f4e9a3651390..2db5b9aa250a067045d65b01aa0a281362db8d0e
--- 1/drivers/video/exynos/exynos_dp_reg.c
--- 2/drivers/video/exynos/exynos_dp_reg.c
+++ b/drivers/video/exynos/exynos_dp_reg.c
@@@ -122,7 -122,7 +122,7 @@@ void exynos_dp_reset(struct exynos_dp_d
                LS_CLK_DOMAIN_FUNC_EN_N;
        writel(reg, dp->reg_base + EXYNOS_DP_FUNC_EN_2);
  
-       udelay(20);
+       usleep_range(20, 30);
  
        exynos_dp_lane_swap(dp, 0);
  
@@@ -752,7 -752,7 +752,7 @@@ int exynos_dp_read_bytes_from_i2c(struc
  
                        /*
                         * If Rx sends defer, Tx sends only reads
 -                       * request without sending addres
 +                       * request without sending address
                         */
                        if (!defer)
                                retval = exynos_dp_select_i2c_device(dp,
@@@ -988,7 -988,7 +988,7 @@@ void exynos_dp_reset_macro(struct exyno
        writel(reg, dp->reg_base + EXYNOS_DP_PHY_TEST);
  
        /* 10 us is the minimum reset time. */
-       udelay(10);
+       usleep_range(10, 20);
  
        reg &= ~MACRO_RST;
        writel(reg, dp->reg_base + EXYNOS_DP_PHY_TEST);

diff --combined drivers/video/exynos/exynos_mipi_dsi.c
index 9908e75ae761e625dd2944207007c702efce1960,939064064a4f4318891c71f227fc905caebf8a81..4bc2b8a5dd8b0c41efbda3fa24774e5f51683535
--- 1/drivers/video/exynos/exynos_mipi_dsi.c
--- 2/drivers/video/exynos/exynos_mipi_dsi.c
+++ b/drivers/video/exynos/exynos_mipi_dsi.c
@@@ -106,7 -106,7 +106,7 @@@ static void exynos_mipi_update_cfg(stru
  
        /*
         * data from Display controller(FIMD) is transferred in video mode
 -       * but in case of command mode, all settigs is updated to registers.
 +       * but in case of command mode, all settings are updated to registers.
         */
        exynos_mipi_dsi_stand_by(dsim, 1);
  }
@@@ -154,7 -154,7 +154,7 @@@ static int exynos_mipi_dsi_blank_mode(s
                if (client_drv && client_drv->power_on)
                        client_drv->power_on(client_dev, 1);
  
-               exynos_mipi_regulator_disable(dsim);
+               exynos_mipi_regulator_enable(dsim);
  
                /* enable MIPI-DSI PHY. */
                if (dsim->pd->phy_enable)

diff --combined drivers/video/smscufx.c
index 26f86428949885bf5e86ff1f801b13975ae7a293,f39e0690f48473995f21ef897561077cc839ee0b..5533a32c6ca132e8c981b7306c88d354fea7a23c
--- 1/drivers/video/smscufx.c
--- 2/drivers/video/smscufx.c
+++ b/drivers/video/smscufx.c
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * smscufx.c -- Framebuffer driver for SMSC UFX USB controller
   *
 - * Copyright (C) 2011 Steve Glendinning <steve.glendinning@smsc.com>
 + * Copyright (C) 2011 Steve Glendinning <steve.glendinning@shawell.net>
   * Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it>
   * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com>
   * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com>
@@@ -904,7 -904,7 +904,7 @@@ static ssize_t ufx_ops_write(struct fb_
        result = fb_sys_write(info, buf, count, ppos);
  
        if (result > 0) {
-               int start = max((int)(offset / info->fix.line_length) - 1, 0);
+               int start = max((int)(offset / info->fix.line_length), 0);
                int lines = min((u32)((result / info->fix.line_length) + 1),
                                (u32)info->var.yres);
  
@@@ -1002,7 -1002,7 +1002,7 @@@ static int ufx_ops_ioctl(struct fb_inf
        /* TODO: Help propose a standard fb.h ioctl to report mmap damage */
        if (cmd == UFX_IOCTL_REPORT_DAMAGE) {
                /* If we have a damage-aware client, turn fb_defio "off"
 -               * To avoid perf imact of unecessary page fault handling.
 +               * To avoid perf imact of unnecessary page fault handling.
                 * Done by resetting the delay for this fb_info to a very
                 * long period. Pages will become writable and stay that way.
                 * Reset to normal value when all clients have closed this fb.
@@@ -1466,7 -1466,7 +1466,7 @@@ static int ufx_read_edid(struct ufx_dat
        /* all FF's in the first 16 bytes indicates nothing is connected */
        for (i = 0; i < 16; i++) {
                if (edid[i] != 0xFF) {
 -                      pr_debug("edid data read succesfully");
 +                      pr_debug("edid data read successfully");
                        return EDID_LENGTH;
                }
        }
@@@ -1972,6 -1972,6 +1972,6 @@@ MODULE_PARM_DESC(console, "Allow fbcon 
  module_param(fb_defio, bool, S_IWUSR | S_IRUSR | S_IWGRP | S_IRGRP);
  MODULE_PARM_DESC(fb_defio, "Enable fb_defio mmap support");
  
 -MODULE_AUTHOR("Steve Glendinning <steve.glendinning@smsc.com>");
 +MODULE_AUTHOR("Steve Glendinning <steve.glendinning@shawell.net>");
  MODULE_DESCRIPTION("SMSC UFX kernel framebuffer driver");
  MODULE_LICENSE("GPL");