• L
    Merge tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux · 2b831888
    Linus Torvalds 提交于
    Pull fbdev changes from Tomi Valkeinen:
     "OMAPDSS changes, including:
       - use dynanic debug prints
       - OMAP platform dependency removals
       - Creation of compat-layer, helping us to improve omapdrm
       - Misc cleanups, aiming to make omadss more in line with the upcoming
         common display framework
    
      Exynos DP changes for the 3.8 merge window:
       - Device Tree support for Samsung Exynos DP
       - SW Link training is cleaned up.
       - HPD interrupt is supported.
    
      Samsung Framebuffer changes for the 3.8 merge window:
       - The bit definitions of header file are updated.
       - Some minor typos are fixed.
       - Some minor bugs of s3c_fb_check_var() are fixed.
    
      FB related changes for SH Mobile, Freescale DIU
    
      Add support for the Solomon SSD1307 OLED Controller"
    
    * tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux: (191 commits)
      OMAPDSS: fix TV-out issue with DSI PLL
      Revert "OMAPFB: simplify locking"
      OMAPFB: remove silly loop in fb2display()
      OMAPFB: fix error handling in omapfb_find_best_mode()
      OMAPFB: use devm_kzalloc to allocate omapfb2_device
      OMAPDSS: DISPC: remove dispc fck uses
      OMAPDSS: DISPC: get dss clock rate from dss driver
      drivers/video/console/softcursor.c: remove redundant NULL check before kfree()
      drivers/video: add support for the Solomon SSD1307 OLED Controller
      OMAPDSS: use omapdss_compat_init() in other drivers
      OMAPDSS: export dispc functions
      OMAPDSS: export dss_feat functions
      OMAPDSS: export dss_mgr_ops functions
      OMAPDSS: separate compat files in the Makefile
      OMAPDSS: move display sysfs init to compat layer
      OMAPDSS: DPI: use dispc's check_timings
      OMAPDSS: DISPC: add dispc_ovl_check()
      OMAPDSS: move irq handling to dispc-compat
      OMAPDSS: move omap_dispc_wait_for_irq_interruptible_timeout to dispc-compat.c
      OMAPDSS: move blocking mgr enable/disable to compat layer
      ...
    
    Conflicts:
    	arch/arm/mach-davinci/devices-da8xx.c
    	arch/arm/plat-omap/common.c
    	drivers/media/platform/omap/omap_vout.c
    2b831888
board-ap4evb.c 30.9 KB