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

Commit f3dab1e3 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

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: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: default avatarDave Airlie <airlied@gmail.com>
Acked-by: default avatarRob Clark <robdclark@gmail.com>
parent d232fd04

drivers/media/platform/omap/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ config VIDEO_OMAP2_VOUT 
	tristate "OMAP2/OMAP3 V4L2-Display driver"

	depends on MMU

	depends on ARCH_OMAP2 || ARCH_OMAP3

	depends on FB_OMAP2

	select VIDEOBUF_GEN

	select VIDEOBUF_DMA_CONTIG

	select OMAP2_DSS if HAS_IOMEM && ARCH_OMAP2PLUS

	select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3

	select VIDEO_OMAP2_VOUT_VRFB if VIDEO_OMAP2_VOUT && OMAP2_VRFB

	select FRAME_VECTOR

drivers/video/fbdev/omap2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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/

drivers/video/fbdev/omap2/omapfb/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -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

drivers/video/fbdev/omap2/omapfb/Makefile

+2 −0
Original line number Diff line number Diff line 
obj-y += dss/

obj-y += displays/

obj-$(CONFIG_FB_OMAP2) += omapfb.o

omapfb-y := omapfb-main.o omapfb-sysfs.o omapfb-ioctl.o