Merge tag 'fbdev-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

Pull fbdev updates from Tomi Valkeinen:

 - ssd1307fb: various fixes and improvements, SSD1305 support

 - use architecture agnostic functions instead of MTRR functions in
   various fbdev drivers

 - TI DRA7xx SoC display support (arch/arm/ side)

 - OMAPDSS componentization to fix probing order issues

 - OMAPDSS scaling fixes

 - msm_fb: remove obsoleted driver

* tag 'fbdev-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (77 commits)
  msm: msm_fb: Remove dead code
  OMAPDSS: HDMI: wait for framedone when stopping video
  OMAPDSS: HDMI4: fix error handling
  OMAPDSS: DISPC: scaler debug print
  OMAPDSS: DISPC: do only y decimation on OMAP3
  OMAPDSS: DISPC: check if scaling setup failed
  OMAPDSS: DISPC: fix 64 bit issue in 5-tap
  OMAPDSS: DISPC: fix row_inc for OMAP3
  OMAPDSS: DISPC: add check for scaling limits
  OMAPDSS: DISPC: fix check_horiz_timing_omap3 args
  OMAPDSS: DISPC: fix predecimation for YUV modes
  OMAPDSS: DISPC: work-around for errata i631
  OMAPDSS: simplify submodule reg/unreg code
  OMAPDSS: componentize omapdss
  OMAPDSS: reorder uninit calls
  OMAPDSS: remove uses of __init/__exit
  OMAPDSS: fix dss_init_ports error handling
  OMAPDSS: refactor dss probe function
  OMAPDSS: move 'dss_initialized' to dss driver
  fbdev: propagate result of fb_videomode_from_videomode()
  ...

diff --combined Documentation/devicetree/bindings/vendor-prefixes.txt
index 7b8c1295fd90bcab2e40becd337c6de1e5786e9d,ce4a23e42ca2e6c640552c26c78d5b67d3ff27c2..53d87bad0adc0bba3e2722cc4f7a9e080401da0e
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -161,7 -161,6 +161,7 @@@ ralink     Mediatek/Ralink Technology Corp
  ramtron       Ramtron International
  realtek Realtek Semiconductor Corp.
  renesas       Renesas Electronics Corporation
 +richtek       Richtek Technology Corporation
  ricoh Ricoh Co. Ltd.
  rockchip      Fuzhou Rockchip Electronics Co., Ltd
  samsung       Samsung Semiconductor
@@@ -182,6 -181,7 +182,7 @@@ skyworks   Skyworks Solutions, Inc
  smsc  Standard Microsystems Corporation
  snps  Synopsys, Inc.
  solidrun      SolidRun
+ solomon        Solomon Systech Limited
  sony  Sony Corporation
  spansion      Spansion Inc.
  sprd  Spreadtrum Communications Inc.

diff --combined drivers/video/fbdev/amifb.c
index ee3a703acf23aac813d613eafc1dedcf79d02dbb,a171bd93eb6a83e5ca1a65add1c01edde4809dc9..1d702e13aaff08771f873d705f1fdeb79ad2a3ee
--- 1/drivers/video/fbdev/amifb.c
--- 2/drivers/video/fbdev/amifb.c
+++ b/drivers/video/fbdev/amifb.c
@@@ -2052,7 -2052,7 +2052,7 @@@ static void ami_set_sprite(const struc
  {
        copins *copl, *cops;
        u_short hs, vs, ve;
-       u_long pl, ps, pt;
+       u_long pl, ps;
        short mx, my;
  
        cops = copdisplay.list[currentcop][0];
@@@ -2078,7 -2078,7 +2078,7 @@@
                        if (mod2(vs)) {
                                lofsprite[1 << par->crsr.fmode] = spr2hw_ctl(vs, hs, ve);
                                shfsprite[1 << par->crsr.fmode] = spr2hw_ctl(vs + 1, hs, ve + 1);
-                               pt = pl; pl = ps; ps = pt;
+                               swap(pl, ps);
                        } else {
                                lofsprite[1 << par->crsr.fmode] = spr2hw_ctl(vs, hs, ve + 1);
                                shfsprite[1 << par->crsr.fmode] = spr2hw_ctl(vs + 1, hs, ve);
@@@ -3705,8 -3705,8 +3705,8 @@@ default_chipset
         * access the videomem with writethrough cache
         */
        info->fix.smem_start = (u_long)ZTWO_PADDR(videomemory);
 -      videomemory = (u_long)ioremap_writethrough(info->fix.smem_start,
 -                                                 info->fix.smem_len);
 +      videomemory = (u_long)ioremap_wt(info->fix.smem_start,
 +                                       info->fix.smem_len);
        if (!videomemory) {
                dev_warn(&pdev->dev,
                         "Unable to map videomem cached writethrough\n");