This patch updates the Makefile and Kconfig for adding support for
vpfe capture driver
Signed-off-by: Murali Karicheri <[EMAIL PROTECTED]>
---
drivers/media/video/Kconfig | 27 +++++++++++++++++++++------
drivers/media/video/Makefile | 2 +-
2 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 9779a2c..954af04 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -483,17 +483,32 @@ config VIDEO_TVP5146
To compile this driver as a module, choose M here: the
module will be called tvp5146.
-config VIDEO_DAVINCI
- tristate "Davinci Video Capture"
- depends on VIDEO_DEV && VIDEO_TVP5146 && ARCH_DAVINCI
- select VIDEOBUF_GEN
- select VIDEOBUF_DMA_SG
+config VIDEO_VPFE_CAPTURE
+ tristate "VPFE Video Capture"
+ depends on VIDEO_DEV && ARCH_DAVINCI
+ select VIDEOBUF_DMA_CONTIG
help
- Support for Davinci based frame grabber through CCDC.
+ Support for DMXXXX VPFE based frame grabber. This is the
+ common V4L2 module for following DMXXX SoCs from Texas
+ Instruments:- DM6446 & DM355.
To compile this driver as a module, choose M here: the
module will be called vpfe.
+config VIDEO_DAVINCI_CCDC
+ tristate "DM6446 CCDC HW module"
+ depends on ARCH_DAVINCI_DM644x && VIDEO_VPFE_CAPTURE
+ default y
+ help
+ Enables DaVinci CCD hw module. DaVinci CCDC hw interfaces
+ with decoder modules such as TVP5146 over BT656 or
+ sensor module such as MT9T001 over a raw interface. This
+ module configures the interface and CCDC/ISIF to do
+ video frame capture from either of the above modules.
+
+ To compile this driver as a module, choose M here: the
+ module will be called vpfe.
+
source "drivers/media/video/bt8xx/Kconfig"
config VIDEO_SAA6588
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 865f01d..94dea41 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -126,7 +126,7 @@ obj-$(CONFIG_USB_S2255) += s2255drv.o
obj-$(CONFIG_VIDEO_IVTV) += ivtv/
obj-$(CONFIG_VIDEO_CX18) += cx18/
-obj-$(CONFIG_VIDEO_DAVINCI) += davinci-vpfe.o
+obj-$(CONFIG_ARCH_DAVINCI) += davinci/
obj-$(CONFIG_VIDEO_TVP5146) += tvp5146.o
obj-$(CONFIG_VIDEO_VIVI) += vivi.o
--
1.5.6.4
_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
