omapfb: Add support for omap framebuffer

Import framebuffer support for omap from linux-omap-historic
branch.

NOTE: This patch needs to be split and prepared for upstream
and then moved to omap-drivers branch.

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 7f5a598..aed9922 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1633,6 +1633,10 @@ config FB_PS3_DEFAULT_SIZE_M
          The default value can be overridden on the kernel command line
          using the "ps3fb" option (e.g. "ps3fb=9M");
 
+if ARCH_OMAP
+       source "drivers/video/omap/Kconfig"
+endif
+
 config FB_VIRTUAL
        tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
        depends on FB

diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 760305c..705c5b5 100644 (file)
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -105,6 +105,7 @@ obj-$(CONFIG_FB_VESA)             += vesafb.o
 obj-$(CONFIG_FB_IMAC)             += imacfb.o
 obj-$(CONFIG_FB_VGA16)            += vga16fb.o vgastate.o
 obj-$(CONFIG_FB_OF)               += offb.o
+obj-$(CONFIG_FB_OMAP)             += omap/ cfbcopyarea.o cfbfillrect.o cfbimgblt.o
 
 # the test framebuffer is last
 obj-$(CONFIG_FB_VIRTUAL)          += vfb.o

diff --cc drivers/video/omap/Kconfig
Simple merge

diff --cc drivers/video/omap/Makefile
Simple merge

diff --cc drivers/video/omap/blizzard.c
Simple merge

diff --cc drivers/video/omap/dispc.c
Simple merge

diff --cc drivers/video/omap/dispc.h
Simple merge

diff --cc drivers/video/omap/hwa742.c
Simple merge

diff --cc drivers/video/omap/lcd_ams_delta.c
Simple merge

diff --cc drivers/video/omap/lcd_apollon.c
Simple merge

diff --cc drivers/video/omap/lcd_h2.c
Simple merge

diff --cc drivers/video/omap/lcd_h3.c
Simple merge

diff --cc drivers/video/omap/lcd_h4.c
Simple merge

diff --cc drivers/video/omap/lcd_inn1510.c
Simple merge

diff --cc drivers/video/omap/lcd_inn1610.c
Simple merge

diff --cc drivers/video/omap/lcd_mipid.c
Simple merge

diff --cc drivers/video/omap/lcd_osk.c
Simple merge

diff --cc drivers/video/omap/lcd_p2.c
Simple merge

diff --cc drivers/video/omap/lcd_palmte.c
Simple merge

diff --cc drivers/video/omap/lcd_palmtt.c
Simple merge

diff --cc drivers/video/omap/lcd_palmz71.c
Simple merge

diff --cc drivers/video/omap/lcd_sx1.c
Simple merge

diff --cc drivers/video/omap/lcdc.c
Simple merge

diff --cc drivers/video/omap/lcdc.h
Simple merge

diff --cc drivers/video/omap/omapfb_main.c
Simple merge

diff --cc drivers/video/omap/rfbi.c
Simple merge

diff --cc drivers/video/omap/sossi.c
Simple merge

diff --cc include/linux/fb.h
Simple merge