omapfb: take omapfb's private omapdss into use

omapfb's private copy of omapdss is now ready to be used.

This patch makes omapfb use its private omapdss and display drivers, and
also makes omap_vout (which uses omapfb) to depend on omapfb.

Signed-off-by: Tomi Valkeinen <[email protected]>
Acked-by: Dave Airlie <[email protected]>
Acked-by: Rob Clark <[email protected]>
This commit is contained in:
Tomi Valkeinen 2015-12-09 19:32:27 +02:00
commit f3dab1e317
4 changed files with 12 additions and 2 deletions

View file

@ -2,4 +2,4 @@ obj-$(CONFIG_OMAP2_VRFB) += vrfb.o
obj-y += dss/
obj-y += displays-new/
obj-$(CONFIG_FB_OMAP2) += omapfb/
obj-y += omapfb/

View file

@ -3,6 +3,7 @@ menuconfig FB_OMAP2
depends on FB
depends on DRM_OMAP = n
select FB_OMAP2_DSS
select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
@ -10,6 +11,8 @@ menuconfig FB_OMAP2
help
Frame buffer driver for OMAP2+ based boards.
if FB_OMAP2
config FB_OMAP2_DEBUG_SUPPORT
bool "Debug support for OMAP2+ FB"
default y
@ -26,3 +29,8 @@ config FB_OMAP2_NUM_FBS
help
Select the number of framebuffers created. OMAP2/3 has 3 overlays
so normally this would be 3.
source "drivers/video/fbdev/omap2/omapfb/dss/Kconfig"
source "drivers/video/fbdev/omap2/omapfb/displays/Kconfig"
endif

View file

@ -1,2 +1,4 @@
obj-y += dss/
obj-y += displays/
obj-$(CONFIG_FB_OMAP2) += omapfb.o
omapfb-y := omapfb-main.o omapfb-sysfs.o omapfb-ioctl.o