Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f76945a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull fbdev updates from Florian Tobias Schandinat:
 "This includes:
   - large updates for OMAP
     - basic OMAP5 DSS support for DPI and DSI outputs
     - large cleanups and restructuring
   - some update to Exynos and da8xx-fb
   - removal of the pnx4008 driver (arch removed)
   - various other small patches"

Fix up some trivial conflicts (mostly just include line changes, but
also some due to the renaming of the deferred work functions by Tejun).

* tag 'fbdev-updates-for-3.7' of git://github.com/schandinat/linux-2.6: (193 commits)
  gbefb: fix compile error
  video: mark nuc900fb_map_video_memory as __devinit
  video/mx3fb: set .owner to prevent module unloading while being used
  video: exynos_dp: use clk_prepare_enable and clk_disable_unprepare
  drivers/video/exynos/exynos_mipi_dsi.c: fix error return code
  drivers/video/savage/savagefb_driver.c: fix error return code
  video: s3c-fb: use clk_prepare_enable and clk_disable_unprepare
  da8xx-fb: save and restore LCDC context across suspend/resume cycle
  da8xx-fb: add pm_runtime support
  video/udlfb: fix line counting in fb_write
  OMAPDSS: add missing include for string.h
  OMAPDSS: DISPC: Configure color conversion coefficients for writeback
  OMAPDSS: DISPC: Add manager like functions for writeback
  OMAPDSS: DISPC: Configure writeback FIFOs
  OMAPDSS: DISPC: Configure writeback specific parameters in dispc_wb_setup()
  OMAPDSS: DISPC: Configure overlay-like parameters in dispc_wb_setup
  OMAPDSS: DISPC: Add function to set channel in for writeback
  OMAPDSS: DISPC: Don't set chroma resampling bit for writeback
  OMAPDSS: DISPC: Downscale chroma if plane is writeback
  OMAPDSS: DISPC: Configure input and output sizes for writeback
  ...
parents 940e3a8d cd9d6f10

arch/arm/mach-exynos/mach-nuri.c

+1 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <drm/exynos_drm.h>



#include <video/platform_lcd.h>

#include <video/samsung_fimd.h>

#include <media/m5mols.h>

#include <media/s5k6aa.h>

#include <media/s5p_fimc.h>
@@ -39,7 +40,6 @@ 
#include <asm/mach-types.h>



#include <plat/adc.h>

#include <plat/regs-fb-v4.h>

#include <plat/regs-serial.h>

#include <plat/cpu.h>

#include <plat/devs.h>

arch/arm/mach-exynos/mach-origen.c

+1 −1
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ 
#include <asm/mach-types.h>



#include <video/platform_lcd.h>

#include <video/samsung_fimd.h>



#include <plat/regs-serial.h>

#include <plat/regs-fb-v4.h>

#include <plat/cpu.h>

#include <plat/devs.h>

#include <plat/sdhci.h>

arch/arm/mach-exynos/mach-smdk4x12.c

+1 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <asm/hardware/gic.h>

#include <asm/mach-types.h>



#include <video/samsung_fimd.h>

#include <plat/backlight.h>

#include <plat/clock.h>

#include <plat/cpu.h>
@@ -36,7 +37,6 @@ 
#include <linux/platform_data/i2c-s3c2410.h>

#include <plat/keypad.h>

#include <plat/mfc.h>

#include <plat/regs-fb.h>

#include <plat/regs-serial.h>

#include <plat/sdhci.h>

arch/arm/mach-exynos/mach-smdkv310.c

+1 −1
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ 
#include <asm/mach-types.h>



#include <video/platform_lcd.h>

#include <video/samsung_fimd.h>

#include <plat/regs-serial.h>

#include <plat/regs-srom.h>

#include <plat/regs-fb-v4.h>

#include <plat/cpu.h>

#include <plat/devs.h>

#include <plat/fb.h>

arch/arm/mach-exynos/mach-universal_c210.c

+1 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <asm/hardware/gic.h>

#include <asm/mach-types.h>



#include <video/samsung_fimd.h>

#include <plat/regs-serial.h>

#include <plat/clock.h>

#include <plat/cpu.h>
@@ -39,7 +40,6 @@ 
#include <plat/fb.h>

#include <plat/mfc.h>

#include <plat/sdhci.h>

#include <plat/regs-fb-v4.h>

#include <plat/fimc-core.h>

#include <plat/s5p-time.h>

#include <plat/camport.h>