aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/Kconfig49
-rw-r--r--drivers/media/video/Makefile2
-rw-r--r--drivers/media/video/davinci/Makefile6
3 files changed, 57 insertions, 0 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index df20283151c..9b8f79afe19 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -527,6 +527,55 @@ config VIDEO_VIVI
527 Say Y here if you want to test video apps or debug V4L devices. 527 Say Y here if you want to test video apps or debug V4L devices.
528 In doubt, say N. 528 In doubt, say N.
529 529
530config VIDEO_VPSS_SYSTEM
531 tristate "VPSS System module driver"
532 depends on ARCH_DAVINCI
533 help
534 Support for vpss system module for video driver
535 default y
536
537config VIDEO_VPFE_CAPTURE
538 tristate "VPFE Video Capture Driver"
539 depends on VIDEO_V4L2 && ARCH_DAVINCI
540 select VIDEOBUF_DMA_CONTIG
541 help
542 Support for DMXXXX VPFE based frame grabber. This is the
543 common V4L2 module for following DMXXX SoCs from Texas
544 Instruments:- DM6446 & DM355.
545
546 To compile this driver as a module, choose M here: the
547 module will be called vpfe-capture.
548
549config VIDEO_DM6446_CCDC
550 tristate "DM6446 CCDC HW module"
551 depends on ARCH_DAVINCI_DM644x && VIDEO_VPFE_CAPTURE
552 select VIDEO_VPSS_SYSTEM
553 default y
554 help
555 Enables DaVinci CCD hw module. DaVinci CCDC hw interfaces
556 with decoder modules such as TVP5146 over BT656 or
557 sensor module such as MT9T001 over a raw interface. This
558 module configures the interface and CCDC/ISIF to do
559 video frame capture from slave decoders.
560
561 To compile this driver as a module, choose M here: the
562 module will be called vpfe.
563
564config VIDEO_DM355_CCDC
565 tristate "DM355 CCDC HW module"
566 depends on ARCH_DAVINCI_DM355 && VIDEO_VPFE_CAPTURE
567 select VIDEO_VPSS_SYSTEM
568 default y
569 help
570 Enables DM355 CCD hw module. DM355 CCDC hw interfaces
571 with decoder modules such as TVP5146 over BT656 or
572 sensor module such as MT9T001 over a raw interface. This
573 module configures the interface and CCDC/ISIF to do
574 video frame capture from a slave decoders
575
576 To compile this driver as a module, choose M here: the
577 module will be called vpfe.
578
530source "drivers/media/video/bt8xx/Kconfig" 579source "drivers/media/video/bt8xx/Kconfig"
531 580
532config VIDEO_PMS 581config VIDEO_PMS
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 70804caa5f3..040bc049200 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -154,6 +154,8 @@ obj-$(CONFIG_VIDEO_MX3) += mx3_camera.o
154obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o 154obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o
155obj-$(CONFIG_VIDEO_SH_MOBILE_CEU) += sh_mobile_ceu_camera.o 155obj-$(CONFIG_VIDEO_SH_MOBILE_CEU) += sh_mobile_ceu_camera.o
156 156
157obj-$(CONFIG_ARCH_DAVINCI) += davinci/
158
157obj-$(CONFIG_VIDEO_AU0828) += au0828/ 159obj-$(CONFIG_VIDEO_AU0828) += au0828/
158 160
159obj-$(CONFIG_USB_VIDEO_CLASS) += uvc/ 161obj-$(CONFIG_USB_VIDEO_CLASS) += uvc/
diff --git a/drivers/media/video/davinci/Makefile b/drivers/media/video/davinci/Makefile
index 7fe9bce9716..f44cad2f541 100644
--- a/drivers/media/video/davinci/Makefile
+++ b/drivers/media/video/davinci/Makefile
@@ -7,3 +7,9 @@ obj-$(CONFIG_VIDEO_DAVINCI_VPIF) += vpif.o
7 7
8#DM646x EVM Display driver 8#DM646x EVM Display driver
9obj-$(CONFIG_DISPLAY_DAVINCI_DM646X_EVM) += vpif_display.o 9obj-$(CONFIG_DISPLAY_DAVINCI_DM646X_EVM) += vpif_display.o
10
11# Capture: DM6446 and DM355
12obj-$(CONFIG_VIDEO_VPSS_SYSTEM) += vpss.o
13obj-$(CONFIG_VIDEO_VPFE_CAPTURE) += vpfe_capture.o
14obj-$(CONFIG_VIDEO_DM6446_CCDC) += dm644x_ccdc.o
15obj-$(CONFIG_VIDEO_DM355_CCDC) += dm355_ccdc.o