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