kernel/git/stable/linux.git/arch/arm/plat-omap/fb.c, branch master

ARM: OMAP: Split fb.c to remove last remaining cpu_is_omap usage

2012-12-17T18:50:40+00:00

Looks like we missed plat-omap/fb.c for cpu_is_omap usage mach-omap2. This is the last user of cpu_is_omap, so let's quickly fix it up so we can finally remove plat/cpu.h for omap2lus. We want to limit cpu_is_omap macro usage to mach-omap2 only so we can make plat/cpu.h private. After this we can finally drop plat/cpu.h for omap2+. Cc: Tomi Valkeinen Signed-off-by: Tony Lindgren

Merge tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux

2012-12-15T21:03:48+00:00

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

Merge branch '3.8/vram-conversion' of git://gitorious.org/linux-omap-dss2/linux

2012-11-16T09:42:46+00:00

Conflicts: drivers/video/omap2/dss/Kconfig drivers/video/omap2/omapfb/omapfb-ioctl.c drivers/video/omap2/omapfb/omapfb-main.c Merge changes to make omapfb use common dma_alloc, and remove omap's custom vram allocator.

OMAP: FB: use DMA_BIT_MASK() for fb's coherent_dma_mask

2012-11-13T07:51:42+00:00

Use DMA_BIT_MASK() for fb's coherent_dma_mask for clarity. Signed-off-by: Tomi Valkeinen Acked-by: Tony Lindgren

ARM: OMAP: Remove unnecessary mach and plat includes

2012-11-02T19:00:36+00:00

Now mach/hardware.h is empty for omap2+ and can be removed except for plat-omap/dmtimer.c for omap1. Also the include of mach/irqs.h can now be removed for shared plat-omap/i2c.c as it's no longer needed. Signed-off-by: Tony Lindgren

OMAP: VRFB: convert vrfb to platform device

2012-10-17T09:09:35+00:00

This patch converts vrfb library into a platform device, in an effort to remove omap dependencies. The platform device is registered in arch/arm/plat-omap/fb.c and assigned resources depending on whether running on omap2 or omap3. The vrfb driver will parse those resources and use them to access vrfb configuration registers and the vrfb virtual rotation areas. Signed-off-by: Tomi Valkeinen Cc: Tony Lindgren

ARM: OMAP1: move lcd pdata out of arch/arm/*

2012-09-10T23:34:00+00:00

omap1 lcd platform data resides inside plat/board.h while it should be inside include/linux/... Move the omap1 lcd platform data to include/linux/omapfb.h. Signed-off-by: Igor Grinberg Acked-by: Tomi Valkeinen Signed-off-by: Tony Lindgren

ARM: OMAP2+: Fix compile error when FB_OMAP2 is not set

2012-03-09T07:53:21+00:00

Otherwise we will get: arch/arm/plat-omap/fb.c:101: error: expected ‘)’ before ‘*’ token Signed-off-by: Tony Lindgren Signed-off-by: Tomi Valkeinen

OMAP1: pass LCD config with omapfb_set_lcd_config()

2012-02-23T07:39:23+00:00

LCD config for old omapfb driver is passed with OMAP_TAG_LCD from board files or from the bootloader. In an effort to remove OMAP_TAG_LCD, this patch adds omapfb_set_lcd_config() function that the board files can call to set the LCD config. This has the drawback that configuration can no longer come from the bootloader. Of the boards supported by the kernel, this should only affect N770 which depends on the data from the bootloader. This patch adds an LCD config for N770 to its board files, but that is most probably broken. Fixing this would need information about the HW setup in N770 boards. Signed-off-by: Tomi Valkeinen Acked-by: Tony Lindgren

OMAPFB: remove omapfb_set_platform_data()

2012-02-23T07:39:19+00:00

omapfb_set_platform_data() is no longer used, so remove it. Signed-off-by: Tomi Valkeinen Acked-by: Tony Lindgren