1 Subject:
2 [PATCH 5/7] Kconfig and Makefile changes for vpfe capture driver
3 From:
4 m-karicheri2-l0cyMroinI0@public.gmane.org
5 Date:
6 Fri, 13 Mar 2009 17:23:32 -0400
7 To:
8 davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/@public.gmane.org, davinci_opensource_ccb-uAqBSO/uNfhBDgjK7y7TUQ@public.gmane.org, psp_video-uAqBSO/uNfhBDgjK7y7TUQ@public.gmane.org
9 Newsgroups:
10 gmane.linux.davinci
12 Adding updates to video Kconfig and Makefile and adding
13 Makefile for building vpfe-capture files
15 Signed-off-by: Murali Karicheri <m-karicheri2-l0cyMroinI0@public.gmane.org>
16 ---
17 drivers/media/video/Kconfig | 48 ++++++++++++++++++++++++----------
18 drivers/media/video/Makefile | 6 +---
19 drivers/media/video/davinci/Makefile | 8 +++++
20 3 files changed, 43 insertions(+), 19 deletions(-)
21 create mode 100644 drivers/media/video/davinci/Makefile
23 diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
24 index 1dd98d8..ea3a526 100644
25 --- a/drivers/media/video/Kconfig
26 +++ b/drivers/media/video/Kconfig
27 @@ -485,25 +485,45 @@ config VIDEO_VIVI
28 Say Y here if you want to test video apps or debug V4L devices.
29 In doubt, say N.
31 -config VIDEO_TVP5146
32 - tristate "TVP5146 video decoder"
33 - depends on I2C && ARCH_DAVINCI
34 +config VIDEO_VPFE_CAPTURE
35 + tristate "VPFE Video Capture Driver"
36 + depends on VIDEO_V4L2 && ARCH_DAVINCI
37 + select VIDEOBUF_DMA_CONTIG
38 help
39 - Support for I2C bus based TVP5146 configuration.
40 + Support for DMXXXX VPFE based frame grabber. This is the
41 + common V4L2 module for following DMXXX SoCs from Texas
42 + Instruments:- DM6446 & DM355.
44 To compile this driver as a module, choose M here: the
45 - module will be called tvp5146.
46 + module will be called vpfe-capture.
48 -config VIDEO_DAVINCI
49 - tristate "Davinci Video Capture"
50 - depends on VIDEO_DEV && VIDEO_TVP5146 && ARCH_DAVINCI
51 - select VIDEOBUF_GEN
52 - select VIDEOBUF_DMA_SG
53 +config VIDEO_DAVINCI_CCDC
54 + tristate "DM6446 CCDC HW module"
55 + depends on ARCH_DAVINCI_DM644x && VIDEO_VPFE_CAPTURE
56 + default y
57 help
58 - Support for Davinci based frame grabber through CCDC.
59 -
60 - To compile this driver as a module, choose M here: the
61 - module will be called vpfe.
62 + Enables DaVinci CCD hw module. DaVinci CCDC hw interfaces
63 + with decoder modules such as TVP5146 over BT656 or
64 + sensor module such as MT9T001 over a raw interface. This
65 + module configures the interface and CCDC/ISIF to do
66 + video frame capture from slave decoders.
67 +
68 + To compile this driver as a module, choose M here: the
69 + module will be called vpfe.
70 +
71 +config VIDEO_DM355_CCDC
72 + tristate "DM355 CCDC HW module"
73 + depends on ARCH_DAVINCI_DM355 && VIDEO_VPFE_CAPTURE
74 + default y
75 + help
76 + Enables DM355 CCD hw module. DM355 CCDC hw interfaces
77 + with decoder modules such as TVP5146 over BT656 or
78 + sensor module such as MT9T001 over a raw interface. This
79 + module configures the interface and CCDC/ISIF to do
80 + video frame capture from a slave decoders
81 +
82 + To compile this driver as a module, choose M here: the
83 + module will be called vpfe.
85 source "drivers/media/video/bt8xx/Kconfig"
87 diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
88 index 863b5c8..f8b6c0c 100644
89 --- a/drivers/media/video/Makefile
90 +++ b/drivers/media/video/Makefile
91 @@ -10,8 +10,6 @@ stkwebcam-objs := stk-webcam.o stk-sensor.o
93 omap2cam-objs := omap24xxcam.o omap24xxcam-dma.o
95 -davinci-vpfe-objs := ccdc_davinci.o davinci_vpfe.o
96 -
97 videodev-objs := v4l2-dev.o v4l2-ioctl.o
99 videodev-objs := v4l2-dev.o v4l2-ioctl.o v4l2-device.o v4l2-subdev.o
100 @@ -29,6 +27,7 @@ endif
102 obj-$(CONFIG_VIDEO_TUNER) += tuner.o
104 +obj-$(CONFIG_ARCH_DAVINCI) += davinci/
105 obj-$(CONFIG_VIDEO_BT848) += bt8xx/
106 obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o
107 obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o
108 @@ -135,9 +134,6 @@ obj-$(CONFIG_USB_S2255) += s2255drv.o
109 obj-$(CONFIG_VIDEO_IVTV) += ivtv/
110 obj-$(CONFIG_VIDEO_CX18) += cx18/
112 -obj-$(CONFIG_VIDEO_DAVINCI) += davinci-vpfe.o
113 -obj-$(CONFIG_VIDEO_TVP5146) += tvp5146.o
114 -
115 obj-$(CONFIG_VIDEO_VIVI) += vivi.o
116 obj-$(CONFIG_VIDEO_CX23885) += cx23885/
118 diff --git a/drivers/media/video/davinci/Makefile b/drivers/media/video/davinci/Makefile
119 new file mode 100644
120 index 0000000..77fe038
121 --- /dev/null
122 +++ b/drivers/media/video/davinci/Makefile
123 @@ -0,0 +1,8 @@
124 +#
125 +# Makefile for the davinci video device drivers.
126 +#
127 +
128 +# Capture: DaVinci and DM355
129 +obj-$(CONFIG_VIDEO_DAVINCI_CCDC) += ccdc_davinci.o
130 +obj-$(CONFIG_VIDEO_DM355_CCDC) += ccdc_dm355.o
131 +obj-$(CONFIG_VIDEO_VPFE_CAPTURE) += vpfe_capture.o
132 -- 1.6.0.4