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

Commit 3778d050 authored by Sekhar Nori's avatar Sekhar Nori Committed by Mauro Carvalho Chehab
Browse files

[media] media: davinci: kconfig: fix incorrect selects 



drivers/media/platform/davinci/Kconfig uses selects where
it should be using 'depends on'. This results in warnings of
the following sort when doing randconfig builds.
warning: (VIDEO_DM6446_CCDC && VIDEO_DM355_CCDC && VIDEO_ISIF && VIDEO_DAVINCI_VPBE_DISPLAY) selects VIDEO_VPSS_SYSTEM which has unmet direct dependencies (MEDIA_SUPPORT && V4L_PLATFORM_DRIVERS && ARCH_DAVINCI)
The VPIF kconfigs had a strange 'select' and 'depends on' cross
linkage which have been fixed as well by removing unneeded
VIDEO_DAVINCI_VPIF config symbol.
Similarly, remove the unnecessary VIDEO_VPSS_SYSTEM and
VIDEO_VPFE_CAPTURE. They don't select any independent functionality
and were being used to manage code dependencies which can
be handled using makefile.
Selecting video modules is now dependent on all ARCH_DAVINCI
instead of specific EVMs and SoCs earlier. This should help build
coverage. Remove unnecessary 'default y' for some config symbols.
While at it, fix the Kconfig help text to make it more readable
and fix names of modules created during module build.
Rename VIDEO_ISIF to VIDEO_DM365_ISIF as per suggestion from
Prabhakar.
This patch has only been build tested; I have tried to not break
any existing assumptions. I do not have the setup to test video,
so any test reports welcome.

Reported-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
[prabhakar.csengg@gmail.com: Fixed typo]
Signed-off-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b294a192

drivers/media/platform/davinci/Kconfig

+35 −68
Original line number Original line Diff line number Diff line 
config VIDEO_DAVINCI_VPIF_DISPLAY

config VIDEO_DAVINCI_VPIF_DISPLAY

	tristate "DM646x/DA850/OMAPL138 EVM Video Display"

	tristate "TI DaVinci VPIF V4L2-Display driver"

	depends on VIDEO_DEV && (MACH_DAVINCI_DM6467_EVM || MACH_DAVINCI_DA850_EVM)

	depends on VIDEO_DEV && ARCH_DAVINCI

	select VIDEOBUF2_DMA_CONTIG

	select VIDEOBUF2_DMA_CONTIG

	select VIDEO_DAVINCI_VPIF

	select VIDEO_ADV7343 if MEDIA_SUBDRV_AUTOSELECT

	select VIDEO_ADV7343 if MEDIA_SUBDRV_AUTOSELECT

	select VIDEO_THS7303 if MEDIA_SUBDRV_AUTOSELECT

	select VIDEO_THS7303 if MEDIA_SUBDRV_AUTOSELECT

	help

	help

	  Enables Davinci VPIF module used for display devices.

	  Enables Davinci VPIF module used for display devices.

	  This module is common for following DM6467/DA850/OMAPL138

	  This module is used for display on TI DM6467/DA850/OMAPL138

	  based display devices.

	  SoCs.





	  To compile this driver as a module, choose M here: the

	  To compile this driver as a module, choose M here. There will

	  module will be called vpif_display.

	  be two modules called vpif.ko and vpif_display.ko





config VIDEO_DAVINCI_VPIF_CAPTURE

config VIDEO_DAVINCI_VPIF_CAPTURE

	tristate "DM646x/DA850/OMAPL138 EVM Video Capture"

	tristate "TI DaVinci VPIF video capture driver"

	depends on VIDEO_DEV && (MACH_DAVINCI_DM6467_EVM || MACH_DAVINCI_DA850_EVM)

	depends on VIDEO_DEV && ARCH_DAVINCI

	select VIDEOBUF2_DMA_CONTIG

	select VIDEOBUF2_DMA_CONTIG

	select VIDEO_DAVINCI_VPIF

	help

	  Enables Davinci VPIF module used for captur devices.

	  This module is common for following DM6467/DA850/OMAPL138

	  based capture devices.



	  To compile this driver as a module, choose M here: the

	  module will be called vpif_capture.



config VIDEO_DAVINCI_VPIF

	tristate "DaVinci VPIF Driver"

	depends on VIDEO_DAVINCI_VPIF_DISPLAY || VIDEO_DAVINCI_VPIF_CAPTURE

	help

	help

	  Support for DaVinci VPIF Driver.

	  Enables Davinci VPIF module used for capture devices.

	  This module is used for capture on TI DM6467/DA850/OMAPL138

	  SoCs.





	  To compile this driver as a module, choose M here: the

	  To compile this driver as a module, choose M here. There will

	  module will be called vpif.

	  be two modules called vpif.ko and vpif_capture.ko





config VIDEO_VPSS_SYSTEM

config VIDEO_DM6446_CCDC

	tristate "VPSS System module driver"

	tristate "TI DM6446 CCDC video capture driver"

	depends on ARCH_DAVINCI

	help

	  Support for vpss system module for video driver



config VIDEO_VPFE_CAPTURE

	tristate "VPFE Video Capture Driver"

	depends on VIDEO_V4L2 && (ARCH_DAVINCI || ARCH_OMAP3)

	depends on VIDEO_V4L2 && (ARCH_DAVINCI || ARCH_OMAP3)

	depends on I2C

	select VIDEOBUF_DMA_CONTIG

	select VIDEOBUF_DMA_CONTIG

	help

	  Support for DMx/AMx VPFE based frame grabber. This is the

	  common V4L2 module for following DMx/AMx SoCs from Texas

	  Instruments:- DM6446, DM365, DM355 & AM3517/05.



	  To compile this driver as a module, choose M here: the

	  module will be called vpfe-capture.



config VIDEO_DM6446_CCDC

	tristate "DM6446 CCDC HW module"

	depends on VIDEO_VPFE_CAPTURE

	select VIDEO_VPSS_SYSTEM

	default y

	help

	help

	   Enables DaVinci CCD hw module. DaVinci CCDC hw interfaces

	   Enables DaVinci CCD hw module. DaVinci CCDC hw interfaces

	   with decoder modules such as TVP5146 over BT656 or

	   with decoder modules such as TVP5146 over BT656 or
@@ -66,14 +35,13 @@ config VIDEO_DM6446_CCDC 
	   module configures the interface and CCDC/ISIF to do

	   module configures the interface and CCDC/ISIF to do

	   video frame capture from slave decoders.

	   video frame capture from slave decoders.





	   To compile this driver as a module, choose M here: the

	   To compile this driver as a module, choose M here. There will

	   module will be called vpfe.

	   be three modules called vpfe_capture.ko, vpss.ko and dm644x_ccdc.ko





config VIDEO_DM355_CCDC

config VIDEO_DM355_CCDC

	tristate "DM355 CCDC HW module"

	tristate "TI DM355 CCDC video capture driver"

	depends on ARCH_DAVINCI_DM355 && VIDEO_VPFE_CAPTURE

	depends on VIDEO_V4L2 && ARCH_DAVINCI

	select VIDEO_VPSS_SYSTEM

	select VIDEOBUF_DMA_CONTIG

	default y

	help

	help

	   Enables DM355 CCD hw module. DM355 CCDC hw interfaces

	   Enables DM355 CCD hw module. DM355 CCDC hw interfaces

	   with decoder modules such as TVP5146 over BT656 or

	   with decoder modules such as TVP5146 over BT656 or
@@ -81,31 +49,30 @@ config VIDEO_DM355_CCDC 
	   module configures the interface and CCDC/ISIF to do

	   module configures the interface and CCDC/ISIF to do

	   video frame capture from a slave decoders

	   video frame capture from a slave decoders





	   To compile this driver as a module, choose M here: the

	   To compile this driver as a module, choose M here. There will

	   module will be called vpfe.

	   be three modules called vpfe_capture.ko, vpss.ko and dm355_ccdc.ko





config VIDEO_ISIF

config VIDEO_DM365_ISIF

	tristate "ISIF HW module"

	tristate "TI DM365 ISIF video capture driver"

	depends on ARCH_DAVINCI_DM365 && VIDEO_VPFE_CAPTURE

	depends on VIDEO_V4L2 && ARCH_DAVINCI

	select VIDEO_VPSS_SYSTEM

	select VIDEOBUF_DMA_CONTIG

	default y

	help

	help

	   Enables ISIF hw module. This is the hardware module for

	   Enables ISIF hw module. This is the hardware module for

	   configuring ISIF in VPFE to capture Raw Bayer RGB data from

	   configuring ISIF in VPFE to capture Raw Bayer RGB data from

	   a image sensor or YUV data from a YUV source.

	   a image sensor or YUV data from a YUV source.





	   To compile this driver as a module, choose M here: the

	   To compile this driver as a module, choose M here. There will

	   module will be called vpfe.

	   be three modules called vpfe_capture.ko, vpss.ko and isif.ko





config VIDEO_DAVINCI_VPBE_DISPLAY

config VIDEO_DAVINCI_VPBE_DISPLAY

	tristate "DM644X/DM365/DM355 VPBE HW module"

	tristate "TI DaVinci VPBE V4L2-Display driver"

	depends on ARCH_DAVINCI_DM644x || ARCH_DAVINCI_DM355 || ARCH_DAVINCI_DM365

	depends on ARCH_DAVINCI

	select VIDEO_VPSS_SYSTEM

	select VIDEOBUF2_DMA_CONTIG

	select VIDEOBUF2_DMA_CONTIG

	help

	help

	    Enables Davinci VPBE module used for display devices.

	    Enables Davinci VPBE module used for display devices.

	    This module is common for following DM644x/DM365/DM355

	    This module is used for display on TI DM644x/DM365/DM355

	    based display devices.

	    based display devices.





	    To compile this driver as a module, choose M here: the

	    To compile this driver as a module, choose M here. There will

	    module will be called vpbe.
 
	    be five modules created called vpss.ko, vpbe.ko, vpbe_osd.ko,

	    vpbe_venc.ko and vpbe_display.ko

drivers/media/platform/davinci/Makefile

+6 −11
Original line number Original line Diff line number Diff line
@@ -2,19 +2,14 @@ 
# Makefile for the davinci video device drivers.

# Makefile for the davinci video device drivers.

#

#





# VPIF

obj-$(CONFIG_VIDEO_DAVINCI_VPIF) += vpif.o



#VPIF Display driver

#VPIF Display driver

obj-$(CONFIG_VIDEO_DAVINCI_VPIF_DISPLAY) += vpif_display.o

obj-$(CONFIG_VIDEO_DAVINCI_VPIF_DISPLAY) += vpif.o vpif_display.o

#VPIF Capture driver

#VPIF Capture driver

obj-$(CONFIG_VIDEO_DAVINCI_VPIF_CAPTURE) += vpif_capture.o

obj-$(CONFIG_VIDEO_DAVINCI_VPIF_CAPTURE) += vpif.o vpif_capture.o





# Capture: DM6446 and DM355

# Capture: DM6446 and DM355

obj-$(CONFIG_VIDEO_VPSS_SYSTEM) += vpss.o

obj-$(CONFIG_VIDEO_DM6446_CCDC) += vpfe_capture.o vpss.o dm644x_ccdc.o

obj-$(CONFIG_VIDEO_VPFE_CAPTURE) += vpfe_capture.o

obj-$(CONFIG_VIDEO_DM355_CCDC) += vpfe_capture.o vpss.o dm355_ccdc.o

obj-$(CONFIG_VIDEO_DM6446_CCDC) += dm644x_ccdc.o

obj-$(CONFIG_VIDEO_DM365_ISIF) += vpfe_capture.o vpss.o isif.o

obj-$(CONFIG_VIDEO_DM355_CCDC) += dm355_ccdc.o

obj-$(CONFIG_VIDEO_DAVINCI_VPBE_DISPLAY) += vpss.o vpbe.o vpbe_osd.o \

obj-$(CONFIG_VIDEO_ISIF) += isif.o

obj-$(CONFIG_VIDEO_DAVINCI_VPBE_DISPLAY) += vpbe.o vpbe_osd.o \

	vpbe_venc.o vpbe_display.o
 
	vpbe_venc.o vpbe_display.o