Merge tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux
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
No related branches found
No related tags found
Showing
- Documentation/arm/OMAP/DSS 4 additions, 6 deletionsDocumentation/arm/OMAP/DSS
- Documentation/devicetree/bindings/video/exynos_dp.txt 80 additions, 0 deletionsDocumentation/devicetree/bindings/video/exynos_dp.txt
- Documentation/devicetree/bindings/video/ssd1307fb.txt 24 additions, 0 deletionsDocumentation/devicetree/bindings/video/ssd1307fb.txt
- MAINTAINERS 6 additions, 0 deletionsMAINTAINERS
- arch/arm/mach-davinci/da830.c 1 addition, 1 deletionarch/arm/mach-davinci/da830.c
- arch/arm/mach-davinci/da850.c 1 addition, 1 deletionarch/arm/mach-davinci/da850.c
- arch/arm/mach-davinci/devices-da8xx.c 1 addition, 21 deletionsarch/arm/mach-davinci/devices-da8xx.c
- arch/arm/mach-davinci/pm_domain.c 1 addition, 0 deletionsarch/arm/mach-davinci/pm_domain.c
- arch/arm/mach-omap2/board-rx51-video.c 0 additions, 14 deletionsarch/arm/mach-omap2/board-rx51-video.c
- arch/arm/mach-omap2/board-rx51.c 0 additions, 3 deletionsarch/arm/mach-omap2/board-rx51.c
- arch/arm/mach-omap2/display.c 10 additions, 5 deletionsarch/arm/mach-omap2/display.c
- arch/arm/mach-shmobile/board-ag5evm.c 106 additions, 92 deletionsarch/arm/mach-shmobile/board-ag5evm.c
- arch/arm/mach-shmobile/board-ap4evb.c 1 addition, 3 deletionsarch/arm/mach-shmobile/board-ap4evb.c
- arch/arm/mach-shmobile/board-mackerel.c 0 additions, 6 deletionsarch/arm/mach-shmobile/board-mackerel.c
- arch/arm/plat-omap/fb.c 3 additions, 2 deletionsarch/arm/plat-omap/fb.c
- arch/arm/plat-omap/include/plat/vram.h 0 additions, 43 deletionsarch/arm/plat-omap/include/plat/vram.h
- arch/sh/boards/mach-ap325rxa/setup.c 0 additions, 6 deletionsarch/sh/boards/mach-ap325rxa/setup.c
- arch/sh/boards/mach-ecovec24/setup.c 0 additions, 6 deletionsarch/sh/boards/mach-ecovec24/setup.c
- arch/sh/boards/mach-kfr2r09/lcd_wqvga.c 3 additions, 13 deletionsarch/sh/boards/mach-kfr2r09/lcd_wqvga.c
- arch/sh/boards/mach-kfr2r09/setup.c 5 additions, 2 deletionsarch/sh/boards/mach-kfr2r09/setup.c
Loading
Please register or sign in to comment