aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/media/Kconfig1
-rw-r--r--drivers/media/Makefile2
-rw-r--r--drivers/media/v4l2-core/Kconfig60
-rw-r--r--drivers/media/v4l2-core/Makefile35
-rw-r--r--drivers/media/v4l2-core/tuner-core.c (renamed from drivers/media/video/tuner-core.c)0
-rw-r--r--drivers/media/v4l2-core/v4l2-common.c (renamed from drivers/media/video/v4l2-common.c)0
-rw-r--r--drivers/media/v4l2-core/v4l2-compat-ioctl32.c (renamed from drivers/media/video/v4l2-compat-ioctl32.c)0
-rw-r--r--drivers/media/v4l2-core/v4l2-ctrls.c (renamed from drivers/media/video/v4l2-ctrls.c)0
-rw-r--r--drivers/media/v4l2-core/v4l2-dev.c (renamed from drivers/media/video/v4l2-dev.c)0
-rw-r--r--drivers/media/v4l2-core/v4l2-device.c (renamed from drivers/media/video/v4l2-device.c)0
-rw-r--r--drivers/media/v4l2-core/v4l2-event.c (renamed from drivers/media/video/v4l2-event.c)0
-rw-r--r--drivers/media/v4l2-core/v4l2-fh.c (renamed from drivers/media/video/v4l2-fh.c)0
-rw-r--r--drivers/media/v4l2-core/v4l2-int-device.c (renamed from drivers/media/video/v4l2-int-device.c)0
-rw-r--r--drivers/media/v4l2-core/v4l2-ioctl.c (renamed from drivers/media/video/v4l2-ioctl.c)0
-rw-r--r--drivers/media/v4l2-core/v4l2-mem2mem.c (renamed from drivers/media/video/v4l2-mem2mem.c)0
-rw-r--r--drivers/media/v4l2-core/v4l2-subdev.c (renamed from drivers/media/video/v4l2-subdev.c)0
-rw-r--r--drivers/media/v4l2-core/videobuf-core.c (renamed from drivers/media/video/videobuf-core.c)0
-rw-r--r--drivers/media/v4l2-core/videobuf-dma-contig.c (renamed from drivers/media/video/videobuf-dma-contig.c)0
-rw-r--r--drivers/media/v4l2-core/videobuf-dma-sg.c (renamed from drivers/media/video/videobuf-dma-sg.c)0
-rw-r--r--drivers/media/v4l2-core/videobuf-dvb.c (renamed from drivers/media/video/videobuf-dvb.c)0
-rw-r--r--drivers/media/v4l2-core/videobuf-vmalloc.c (renamed from drivers/media/video/videobuf-vmalloc.c)0
-rw-r--r--drivers/media/v4l2-core/videobuf2-core.c (renamed from drivers/media/video/videobuf2-core.c)0
-rw-r--r--drivers/media/v4l2-core/videobuf2-dma-contig.c (renamed from drivers/media/video/videobuf2-dma-contig.c)0
-rw-r--r--drivers/media/v4l2-core/videobuf2-dma-sg.c (renamed from drivers/media/video/videobuf2-dma-sg.c)0
-rw-r--r--drivers/media/v4l2-core/videobuf2-memops.c (renamed from drivers/media/video/videobuf2-memops.c)0
-rw-r--r--drivers/media/v4l2-core/videobuf2-vmalloc.c (renamed from drivers/media/video/videobuf2-vmalloc.c)0
-rw-r--r--drivers/media/video/Kconfig56
-rw-r--r--drivers/media/video/Makefile27
28 files changed, 97 insertions, 84 deletions
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index d941581ab921..e6253628059a 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -152,6 +152,7 @@ source "drivers/media/common/tuners/Kconfig"
152# Video/Radio/Hybrid adapters 152# Video/Radio/Hybrid adapters
153# 153#
154 154
155source "drivers/media/v4l2-core/Kconfig"
155source "drivers/media/video/Kconfig" 156source "drivers/media/video/Kconfig"
156 157
157source "drivers/media/radio/Kconfig" 158source "drivers/media/radio/Kconfig"
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 64755c99ded2..2f9abaad18f7 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -8,7 +8,7 @@ ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
8 obj-$(CONFIG_MEDIA_SUPPORT) += media.o 8 obj-$(CONFIG_MEDIA_SUPPORT) += media.o
9endif 9endif
10 10
11obj-y += common/ rc/ video/ 11obj-y += v4l2-core/ common/ rc/ video/
12 12
13obj-$(CONFIG_VIDEO_DEV) += radio/ 13obj-$(CONFIG_VIDEO_DEV) += radio/
14obj-$(CONFIG_DVB_CORE) += dvb/ 14obj-$(CONFIG_DVB_CORE) += dvb/
diff --git a/drivers/media/v4l2-core/Kconfig b/drivers/media/v4l2-core/Kconfig
new file mode 100644
index 000000000000..6f53337c4b4f
--- /dev/null
+++ b/drivers/media/v4l2-core/Kconfig
@@ -0,0 +1,60 @@
1#
2# Generic video config states
3#
4
5config VIDEO_V4L2
6 tristate
7 depends on VIDEO_DEV && VIDEO_V4L2_COMMON
8 default y
9
10config VIDEOBUF_GEN
11 tristate
12
13config VIDEOBUF_DMA_SG
14 depends on HAS_DMA
15 select VIDEOBUF_GEN
16 tristate
17
18config VIDEOBUF_VMALLOC
19 select VIDEOBUF_GEN
20 tristate
21
22config VIDEOBUF_DMA_CONTIG
23 depends on HAS_DMA
24 select VIDEOBUF_GEN
25 tristate
26
27config VIDEOBUF_DVB
28 tristate
29 select VIDEOBUF_GEN
30
31config VIDEO_TUNER
32 tristate
33 depends on MEDIA_TUNER
34
35config V4L2_MEM2MEM_DEV
36 tristate
37 depends on VIDEOBUF2_CORE
38
39config VIDEOBUF2_CORE
40 tristate
41
42config VIDEOBUF2_MEMOPS
43 tristate
44
45config VIDEOBUF2_DMA_CONTIG
46 select VIDEOBUF2_CORE
47 select VIDEOBUF2_MEMOPS
48 tristate
49
50config VIDEOBUF2_VMALLOC
51 select VIDEOBUF2_CORE
52 select VIDEOBUF2_MEMOPS
53 tristate
54
55config VIDEOBUF2_DMA_SG
56 #depends on HAS_DMA
57 select VIDEOBUF2_CORE
58 select VIDEOBUF2_MEMOPS
59 tristate
60
diff --git a/drivers/media/v4l2-core/Makefile b/drivers/media/v4l2-core/Makefile
new file mode 100644
index 000000000000..7319c27e256b
--- /dev/null
+++ b/drivers/media/v4l2-core/Makefile
@@ -0,0 +1,35 @@
1#
2# Makefile for the V4L2 core
3#
4
5tuner-objs := tuner-core.o
6
7videodev-objs := v4l2-dev.o v4l2-ioctl.o v4l2-device.o v4l2-fh.o \
8 v4l2-event.o v4l2-ctrls.o v4l2-subdev.o
9ifeq ($(CONFIG_COMPAT),y)
10 videodev-objs += v4l2-compat-ioctl32.o
11endif
12
13obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-int-device.o
14obj-$(CONFIG_VIDEO_V4L2_COMMON) += v4l2-common.o
15
16obj-$(CONFIG_VIDEO_TUNER) += tuner.o
17
18obj-$(CONFIG_V4L2_MEM2MEM_DEV) += v4l2-mem2mem.o
19
20obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o
21obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o
22obj-$(CONFIG_VIDEOBUF_DMA_CONTIG) += videobuf-dma-contig.o
23obj-$(CONFIG_VIDEOBUF_VMALLOC) += videobuf-vmalloc.o
24obj-$(CONFIG_VIDEOBUF_DVB) += videobuf-dvb.o
25
26obj-$(CONFIG_VIDEOBUF2_CORE) += videobuf2-core.o
27obj-$(CONFIG_VIDEOBUF2_MEMOPS) += videobuf2-memops.o
28obj-$(CONFIG_VIDEOBUF2_VMALLOC) += videobuf2-vmalloc.o
29obj-$(CONFIG_VIDEOBUF2_DMA_CONTIG) += videobuf2-dma-contig.o
30obj-$(CONFIG_VIDEOBUF2_DMA_SG) += videobuf2-dma-sg.o
31
32ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
33ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
34ccflags-y += -I$(srctree)/drivers/media/common/tuners
35
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/v4l2-core/tuner-core.c
index b5a819af2b8c..b5a819af2b8c 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/v4l2-core/tuner-core.c
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c
index 105f88cdb9d6..105f88cdb9d6 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/v4l2-core/v4l2-common.c
diff --git a/drivers/media/video/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
index 9ebd5c540d10..9ebd5c540d10 100644
--- a/drivers/media/video/v4l2-compat-ioctl32.c
+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
diff --git a/drivers/media/video/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index b6a2ee71e5c3..b6a2ee71e5c3 100644
--- a/drivers/media/video/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
index 71237f5f85f4..71237f5f85f4 100644
--- a/drivers/media/video/v4l2-dev.c
+++ b/drivers/media/v4l2-core/v4l2-dev.c
diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
index 1f203b85a637..1f203b85a637 100644
--- a/drivers/media/video/v4l2-device.c
+++ b/drivers/media/v4l2-core/v4l2-device.c
diff --git a/drivers/media/video/v4l2-event.c b/drivers/media/v4l2-core/v4l2-event.c
index ef2a33c94045..ef2a33c94045 100644
--- a/drivers/media/video/v4l2-event.c
+++ b/drivers/media/v4l2-core/v4l2-event.c
diff --git a/drivers/media/video/v4l2-fh.c b/drivers/media/v4l2-core/v4l2-fh.c
index 9e3fc040ea20..9e3fc040ea20 100644
--- a/drivers/media/video/v4l2-fh.c
+++ b/drivers/media/v4l2-core/v4l2-fh.c
diff --git a/drivers/media/video/v4l2-int-device.c b/drivers/media/v4l2-core/v4l2-int-device.c
index f4473494af7a..f4473494af7a 100644
--- a/drivers/media/video/v4l2-int-device.c
+++ b/drivers/media/v4l2-core/v4l2-int-device.c
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index c3b7b5f59b32..c3b7b5f59b32 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
diff --git a/drivers/media/video/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
index 97b48318aee1..97b48318aee1 100644
--- a/drivers/media/video/v4l2-mem2mem.c
+++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
diff --git a/drivers/media/video/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
index 9182f81deb5b..9182f81deb5b 100644
--- a/drivers/media/video/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/v4l2-core/videobuf-core.c
index bf7a326b1cdc..bf7a326b1cdc 100644
--- a/drivers/media/video/videobuf-core.c
+++ b/drivers/media/v4l2-core/videobuf-core.c
diff --git a/drivers/media/video/videobuf-dma-contig.c b/drivers/media/v4l2-core/videobuf-dma-contig.c
index 3a43ba0959bf..3a43ba0959bf 100644
--- a/drivers/media/video/videobuf-dma-contig.c
+++ b/drivers/media/v4l2-core/videobuf-dma-contig.c
diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/v4l2-core/videobuf-dma-sg.c
index f300deafd268..f300deafd268 100644
--- a/drivers/media/video/videobuf-dma-sg.c
+++ b/drivers/media/v4l2-core/videobuf-dma-sg.c
diff --git a/drivers/media/video/videobuf-dvb.c b/drivers/media/v4l2-core/videobuf-dvb.c
index b7efa4516d36..b7efa4516d36 100644
--- a/drivers/media/video/videobuf-dvb.c
+++ b/drivers/media/v4l2-core/videobuf-dvb.c
diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/v4l2-core/videobuf-vmalloc.c
index df142580e44c..df142580e44c 100644
--- a/drivers/media/video/videobuf-vmalloc.c
+++ b/drivers/media/v4l2-core/videobuf-vmalloc.c
diff --git a/drivers/media/video/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
index 4da3df61901f..4da3df61901f 100644
--- a/drivers/media/video/videobuf2-core.c
+++ b/drivers/media/v4l2-core/videobuf2-core.c
diff --git a/drivers/media/video/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c
index 4b7132660a93..4b7132660a93 100644
--- a/drivers/media/video/videobuf2-dma-contig.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
diff --git a/drivers/media/video/videobuf2-dma-sg.c b/drivers/media/v4l2-core/videobuf2-dma-sg.c
index 25c3b360e1ad..25c3b360e1ad 100644
--- a/drivers/media/video/videobuf2-dma-sg.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
diff --git a/drivers/media/video/videobuf2-memops.c b/drivers/media/v4l2-core/videobuf2-memops.c
index 504cd4cbe29e..504cd4cbe29e 100644
--- a/drivers/media/video/videobuf2-memops.c
+++ b/drivers/media/v4l2-core/videobuf2-memops.c
diff --git a/drivers/media/video/videobuf2-vmalloc.c b/drivers/media/v4l2-core/videobuf2-vmalloc.c
index 94efa04d8d55..94efa04d8d55 100644
--- a/drivers/media/video/videobuf2-vmalloc.c
+++ b/drivers/media/v4l2-core/videobuf2-vmalloc.c
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index a5e3bd044085..068e8daa6b7b 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -2,32 +2,6 @@
2# Generic video config states 2# Generic video config states
3# 3#
4 4
5config VIDEO_V4L2
6 tristate
7 depends on VIDEO_DEV && VIDEO_V4L2_COMMON
8 default y
9
10config VIDEOBUF_GEN
11 tristate
12
13config VIDEOBUF_DMA_SG
14 depends on HAS_DMA
15 select VIDEOBUF_GEN
16 tristate
17
18config VIDEOBUF_VMALLOC
19 select VIDEOBUF_GEN
20 tristate
21
22config VIDEOBUF_DMA_CONTIG
23 depends on HAS_DMA
24 select VIDEOBUF_GEN
25 tristate
26
27config VIDEOBUF_DVB
28 tristate
29 select VIDEOBUF_GEN
30
31config VIDEO_BTCX 5config VIDEO_BTCX
32 depends on PCI 6 depends on PCI
33 tristate 7 tristate
@@ -36,36 +10,6 @@ config VIDEO_TVEEPROM
36 tristate 10 tristate
37 depends on I2C 11 depends on I2C
38 12
39config VIDEO_TUNER
40 tristate
41 depends on MEDIA_TUNER
42
43config V4L2_MEM2MEM_DEV
44 tristate
45 depends on VIDEOBUF2_CORE
46
47config VIDEOBUF2_CORE
48 tristate
49
50config VIDEOBUF2_MEMOPS
51 tristate
52
53config VIDEOBUF2_DMA_CONTIG
54 select VIDEOBUF2_CORE
55 select VIDEOBUF2_MEMOPS
56 tristate
57
58config VIDEOBUF2_VMALLOC
59 select VIDEOBUF2_CORE
60 select VIDEOBUF2_MEMOPS
61 tristate
62
63
64config VIDEOBUF2_DMA_SG
65 #depends on HAS_DMA
66 select VIDEOBUF2_CORE
67 select VIDEOBUF2_MEMOPS
68 tristate
69# 13#
70# Multimedia Video device configuration 14# Multimedia Video device configuration
71# 15#
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 12cad1206148..839e2c982376 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -2,32 +2,18 @@
2# Makefile for the video capture/playback device drivers. 2# Makefile for the video capture/playback device drivers.
3# 3#
4 4
5tuner-objs := tuner-core.o
6
7msp3400-objs := msp3400-driver.o msp3400-kthreads.o 5msp3400-objs := msp3400-driver.o msp3400-kthreads.o
8 6
9stkwebcam-objs := stk-webcam.o stk-sensor.o 7stkwebcam-objs := stk-webcam.o stk-sensor.o
10 8
11omap2cam-objs := omap24xxcam.o omap24xxcam-dma.o 9omap2cam-objs := omap24xxcam.o omap24xxcam-dma.o
12 10
13videodev-objs := v4l2-dev.o v4l2-ioctl.o v4l2-device.o v4l2-fh.o \
14 v4l2-event.o v4l2-ctrls.o v4l2-subdev.o
15ifeq ($(CONFIG_COMPAT),y)
16 videodev-objs += v4l2-compat-ioctl32.o
17endif
18
19# V4L2 core modules
20
21obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-int-device.o
22obj-$(CONFIG_VIDEO_V4L2_COMMON) += v4l2-common.o
23
24# Helper modules 11# Helper modules
25 12
26obj-$(CONFIG_VIDEO_APTINA_PLL) += aptina-pll.o 13obj-$(CONFIG_VIDEO_APTINA_PLL) += aptina-pll.o
27 14
28# All i2c modules must come first: 15# All i2c modules must come first:
29 16
30obj-$(CONFIG_VIDEO_TUNER) += tuner.o
31obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o 17obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o
32obj-$(CONFIG_VIDEO_TDA7432) += tda7432.o 18obj-$(CONFIG_VIDEO_TDA7432) += tda7432.o
33obj-$(CONFIG_VIDEO_SAA6588) += saa6588.o 19obj-$(CONFIG_VIDEO_SAA6588) += saa6588.o
@@ -128,21 +114,8 @@ obj-$(CONFIG_STA2X11_VIP) += sta2x11_vip.o
128obj-$(CONFIG_VIDEO_TIMBERDALE) += timblogiw.o 114obj-$(CONFIG_VIDEO_TIMBERDALE) += timblogiw.o
129obj-$(CONFIG_VIDEO_STK1160) += stk1160/ 115obj-$(CONFIG_VIDEO_STK1160) += stk1160/
130 116
131obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o
132obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o
133obj-$(CONFIG_VIDEOBUF_DMA_CONTIG) += videobuf-dma-contig.o
134obj-$(CONFIG_VIDEOBUF_VMALLOC) += videobuf-vmalloc.o
135obj-$(CONFIG_VIDEOBUF_DVB) += videobuf-dvb.o
136obj-$(CONFIG_VIDEO_BTCX) += btcx-risc.o 117obj-$(CONFIG_VIDEO_BTCX) += btcx-risc.o
137 118
138obj-$(CONFIG_VIDEOBUF2_CORE) += videobuf2-core.o
139obj-$(CONFIG_VIDEOBUF2_MEMOPS) += videobuf2-memops.o
140obj-$(CONFIG_VIDEOBUF2_VMALLOC) += videobuf2-vmalloc.o
141obj-$(CONFIG_VIDEOBUF2_DMA_CONTIG) += videobuf2-dma-contig.o
142obj-$(CONFIG_VIDEOBUF2_DMA_SG) += videobuf2-dma-sg.o
143
144obj-$(CONFIG_V4L2_MEM2MEM_DEV) += v4l2-mem2mem.o
145
146obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o 119obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o
147 120
148obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o 121obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-12 05:18:53 -0400