Merge tag 'fbdev-v4.15' of git://github.com/bzolnier/linux

Pull fbdev updates from Bartlomiej Zolnierkiewicz:
 "There is nothing really major here (though removal of the dead igafb
  driver stands out in diffstat).

  Summary:

   - convert timers to use timer_setup() (Kees Cook, Thierry Reding)

   - fix panels support on iMX boards in mxsfb driver (Stefan Agner)

   - fix timeout on EDID read in udlfb driver (Ladislav Michl)

   - add missing modes to fix out of bounds access in controlfb driver
     (Geert Uytterhoeven)

   - update initialisation paths in sa1100fb driver to be more robust
     (Russell King)

   - fix error handling path of ->probe method in au1200fb driver
     (Christophe JAILLET)

   - fix handling of cases when either panel or crt is defined in
     sm501fb driver (Sudip Mukherjee, Colin Ian King)

   - add ability to the Goldfish FB driver to be recognized by OS via DT
     (Aleksandar Markovic)

   - structures constifications (Bhumika Goyal)

   - misc fixes (Allen Pais, Gustavo A. R. Silva, Dan Carpenter)

   - misc cleanups (Colin Ian King, Himanshu Jha, Markus Elfring)

   - remove dead igafb driver"

* tag 'fbdev-v4.15' of git://github.com/bzolnier/linux: (42 commits)
  OMAPFB: prevent buffer underflow in omapfb_parse_vram_param()
  video: fbdev: sm501fb: fix potential null pointer dereference on fbi
  fbcon: Initialize ops->info early
  video: fbdev: Convert timers to use timer_setup()
  video: fbdev: pxa3xx_gcu: Convert timers to use timer_setup()
  fbdev: controlfb: Add missing modes to fix out of bounds access
  video: fbdev: sis_main: mark expected switch fall-throughs
  video: fbdev: cirrusfb: mark expected switch fall-throughs
  video: fbdev: aty: radeon_pm: mark expected switch fall-throughs
  video: fbdev: sm501fb: mark expected switch fall-through in sm501fb_blank_crt
  video: fbdev: intelfb: remove redundant variables
  video/fbdev/dnfb: Use common error handling code in dnfb_probe()
  sm501fb: suspend and resume fb if it exists
  sm501fb: unregister framebuffer only if registered
  sm501fb: deallocate colormap only if allocated
  video: goldfishfb: Add support for device tree bindings
  Documentation: Add device tree binding for Goldfish FB driver
  video: udlfb: Fix read EDID timeout
  video: fbdev: remove dead igafb driver
  video: fbdev: mxsfb: fix pixelclock polarity
  ...

diff --combined drivers/video/fbdev/Makefile
index 8895536a20d648723197affff38d1bbf8fc140a8,deb76674e5e9e129ba8fa6599aac55a5a7942850..115961e0721b8ba1aaab4dcfb3b4032a50760637
--- 1/drivers/video/fbdev/Makefile
--- 2/drivers/video/fbdev/Makefile
+++ b/drivers/video/fbdev/Makefile
@@@ -1,4 -1,3 +1,4 @@@
 +# SPDX-License-Identifier: GPL-2.0
  # Makefile for the Linux video drivers.
  # 5 Aug 1999, James Simmons, <mailto:jsimmons@users.sf.net>
  # Rewritten to use lists instead of if-statements.
@@@ -65,7 -64,6 +65,6 @@@ obj-$(CONFIG_FB_HGA)              += hg
  obj-$(CONFIG_FB_XVR500)           += sunxvr500.o
  obj-$(CONFIG_FB_XVR2500)          += sunxvr2500.o
  obj-$(CONFIG_FB_XVR1000)          += sunxvr1000.o
- obj-$(CONFIG_FB_IGA)              += igafb.o
  obj-$(CONFIG_FB_APOLLO)           += dnfb.o
  obj-$(CONFIG_FB_Q40)              += q40fb.o
  obj-$(CONFIG_FB_TGA)              += tgafb.o

diff --combined drivers/video/fbdev/aty/radeon_pm.c
index f7c253dd5899f1e887abe7c768b1681a51b4162d,ccb069f596572928cd096b1613da90bcc8a02617..7137c12cbcee30ce60bbdcc27c62fdaf0c9cfbdc
--- 1/drivers/video/fbdev/aty/radeon_pm.c
--- 2/drivers/video/fbdev/aty/radeon_pm.c
+++ b/drivers/video/fbdev/aty/radeon_pm.c
@@@ -1,4 -1,3 +1,4 @@@
 +// SPDX-License-Identifier: GPL-2.0
  /*
   *    drivers/video/aty/radeon_pm.c
   *
@@@ -1208,9 -1207,11 +1208,11 @@@ static void radeon_pm_enable_dll_m10(st
        case 1:
                if (mc & 0x4)
                        break;
+               /* fall through */
        case 2:
                dll_sleep_mask |= MDLL_R300_RDCK__MRDCKB_SLEEP;
                dll_reset_mask |= MDLL_R300_RDCK__MRDCKB_RESET;
+               /* fall through */
        case 0:
                dll_sleep_mask |= MDLL_R300_RDCK__MRDCKA_SLEEP;
                dll_reset_mask |= MDLL_R300_RDCK__MRDCKA_RESET;
@@@ -1219,6 -1220,7 +1221,7 @@@
        case 1:
                if (!(mc & 0x4))
                        break;
+               /* fall through */
        case 2:
                dll_sleep_mask |= MDLL_R300_RDCK__MRDCKD_SLEEP;
                dll_reset_mask |= MDLL_R300_RDCK__MRDCKD_RESET;