diff options
author | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-08-26 15:45:39 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-08-26 17:52:19 -0400 |
commit | 12bd88e62cf7c1557c7cd78f42a76d7c716b2283 (patch) | |
tree | 3c165d82e2943b98309a5d084666563ce6e648df /drivers | |
parent | 7155043c2d027c9c848c3d09badb5af2894ed652 (diff) |
[media] be sure that HAS_DMA is enabled for vb2-dma-contig
vb2-dma-contig depends on HAS_DMA, but the Kbuild doesn't take
it into account at select.
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/pci/solo6x10/Kconfig | 1 | ||||
-rw-r--r-- | drivers/media/pci/sta2x11/Kconfig | 1 | ||||
-rw-r--r-- | drivers/media/platform/Kconfig | 12 | ||||
-rw-r--r-- | drivers/media/platform/blackfin/Kconfig | 1 | ||||
-rw-r--r-- | drivers/media/platform/davinci/Kconfig | 6 | ||||
-rw-r--r-- | drivers/media/platform/exynos4-is/Kconfig | 3 | ||||
-rw-r--r-- | drivers/media/platform/marvell-ccic/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-tv/Kconfig | 1 | ||||
-rw-r--r-- | drivers/media/platform/soc_camera/Kconfig | 6 | ||||
-rw-r--r-- | drivers/staging/media/davinci_vpfe/Kconfig | 1 | ||||
-rw-r--r-- | drivers/staging/media/dt3155v4l/Kconfig | 1 | ||||
-rw-r--r-- | drivers/staging/media/omap4iss/Kconfig | 1 |
12 files changed, 36 insertions, 0 deletions
diff --git a/drivers/media/pci/solo6x10/Kconfig b/drivers/media/pci/solo6x10/Kconfig index d9e06a6bf1eb..0fb91dc7ca73 100644 --- a/drivers/media/pci/solo6x10/Kconfig +++ b/drivers/media/pci/solo6x10/Kconfig | |||
@@ -1,6 +1,7 @@ | |||
1 | config VIDEO_SOLO6X10 | 1 | config VIDEO_SOLO6X10 |
2 | tristate "Bluecherry / Softlogic 6x10 capture cards (MPEG-4/H.264)" | 2 | tristate "Bluecherry / Softlogic 6x10 capture cards (MPEG-4/H.264)" |
3 | depends on PCI && VIDEO_DEV && SND && I2C | 3 | depends on PCI && VIDEO_DEV && SND && I2C |
4 | depends on HAS_DMA | ||
4 | select BITREVERSE | 5 | select BITREVERSE |
5 | select FONT_SUPPORT | 6 | select FONT_SUPPORT |
6 | select FONT_8x16 | 7 | select FONT_8x16 |
diff --git a/drivers/media/pci/sta2x11/Kconfig b/drivers/media/pci/sta2x11/Kconfig index 03130157db83..f6f30abc088b 100644 --- a/drivers/media/pci/sta2x11/Kconfig +++ b/drivers/media/pci/sta2x11/Kconfig | |||
@@ -1,6 +1,7 @@ | |||
1 | config STA2X11_VIP | 1 | config STA2X11_VIP |
2 | tristate "STA2X11 VIP Video For Linux" | 2 | tristate "STA2X11 VIP Video For Linux" |
3 | depends on STA2X11 | 3 | depends on STA2X11 |
4 | depends on HAS_DMA | ||
4 | select VIDEO_ADV7180 if MEDIA_SUBDRV_AUTOSELECT | 5 | select VIDEO_ADV7180 if MEDIA_SUBDRV_AUTOSELECT |
5 | select VIDEOBUF2_DMA_CONTIG | 6 | select VIDEOBUF2_DMA_CONTIG |
6 | depends on PCI && VIDEO_V4L2 && VIRT_TO_BUS | 7 | depends on PCI && VIDEO_V4L2 && VIRT_TO_BUS |
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index a8ae457f8a02..ae021faf7a42 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig | |||
@@ -96,6 +96,7 @@ config VIDEO_M32R_AR_M64278 | |||
96 | config VIDEO_OMAP3 | 96 | config VIDEO_OMAP3 |
97 | tristate "OMAP 3 Camera support" | 97 | tristate "OMAP 3 Camera support" |
98 | depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3 | 98 | depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3 |
99 | depends on HAS_DMA | ||
99 | select ARM_DMA_USE_IOMMU | 100 | select ARM_DMA_USE_IOMMU |
100 | select OMAP_IOMMU | 101 | select OMAP_IOMMU |
101 | select VIDEOBUF2_DMA_CONTIG | 102 | select VIDEOBUF2_DMA_CONTIG |
@@ -113,6 +114,7 @@ config VIDEO_S3C_CAMIF | |||
113 | depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API | 114 | depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API |
114 | depends on PM_RUNTIME | 115 | depends on PM_RUNTIME |
115 | depends on ARCH_S3C64XX || PLAT_S3C24XX || COMPILE_TEST | 116 | depends on ARCH_S3C64XX || PLAT_S3C24XX || COMPILE_TEST |
117 | depends on HAS_DMA | ||
116 | select VIDEOBUF2_DMA_CONTIG | 118 | select VIDEOBUF2_DMA_CONTIG |
117 | ---help--- | 119 | ---help--- |
118 | This is a v4l2 driver for s3c24xx and s3c64xx SoC series camera | 120 | This is a v4l2 driver for s3c24xx and s3c64xx SoC series camera |
@@ -143,6 +145,7 @@ if V4L_MEM2MEM_DRIVERS | |||
143 | config VIDEO_CODA | 145 | config VIDEO_CODA |
144 | tristate "Chips&Media Coda multi-standard codec IP" | 146 | tristate "Chips&Media Coda multi-standard codec IP" |
145 | depends on VIDEO_DEV && VIDEO_V4L2 && ARCH_MXC | 147 | depends on VIDEO_DEV && VIDEO_V4L2 && ARCH_MXC |
148 | depends on HAS_DMA | ||
146 | select SRAM | 149 | select SRAM |
147 | select VIDEOBUF2_DMA_CONTIG | 150 | select VIDEOBUF2_DMA_CONTIG |
148 | select V4L2_MEM2MEM_DEV | 151 | select V4L2_MEM2MEM_DEV |
@@ -154,6 +157,7 @@ config VIDEO_CODA | |||
154 | config VIDEO_MEM2MEM_DEINTERLACE | 157 | config VIDEO_MEM2MEM_DEINTERLACE |
155 | tristate "Deinterlace support" | 158 | tristate "Deinterlace support" |
156 | depends on VIDEO_DEV && VIDEO_V4L2 && DMA_ENGINE | 159 | depends on VIDEO_DEV && VIDEO_V4L2 && DMA_ENGINE |
160 | depends on HAS_DMA | ||
157 | select VIDEOBUF2_DMA_CONTIG | 161 | select VIDEOBUF2_DMA_CONTIG |
158 | select V4L2_MEM2MEM_DEV | 162 | select V4L2_MEM2MEM_DEV |
159 | help | 163 | help |
@@ -163,6 +167,7 @@ config VIDEO_SAMSUNG_S5P_G2D | |||
163 | tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver" | 167 | tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver" |
164 | depends on VIDEO_DEV && VIDEO_V4L2 | 168 | depends on VIDEO_DEV && VIDEO_V4L2 |
165 | depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST | 169 | depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST |
170 | depends on HAS_DMA | ||
166 | select VIDEOBUF2_DMA_CONTIG | 171 | select VIDEOBUF2_DMA_CONTIG |
167 | select V4L2_MEM2MEM_DEV | 172 | select V4L2_MEM2MEM_DEV |
168 | default n | 173 | default n |
@@ -174,6 +179,7 @@ config VIDEO_SAMSUNG_S5P_JPEG | |||
174 | tristate "Samsung S5P/Exynos3250/Exynos4 JPEG codec driver" | 179 | tristate "Samsung S5P/Exynos3250/Exynos4 JPEG codec driver" |
175 | depends on VIDEO_DEV && VIDEO_V4L2 | 180 | depends on VIDEO_DEV && VIDEO_V4L2 |
176 | depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST | 181 | depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST |
182 | depends on HAS_DMA | ||
177 | select VIDEOBUF2_DMA_CONTIG | 183 | select VIDEOBUF2_DMA_CONTIG |
178 | select V4L2_MEM2MEM_DEV | 184 | select V4L2_MEM2MEM_DEV |
179 | ---help--- | 185 | ---help--- |
@@ -184,6 +190,7 @@ config VIDEO_SAMSUNG_S5P_MFC | |||
184 | tristate "Samsung S5P MFC Video Codec" | 190 | tristate "Samsung S5P MFC Video Codec" |
185 | depends on VIDEO_DEV && VIDEO_V4L2 | 191 | depends on VIDEO_DEV && VIDEO_V4L2 |
186 | depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST | 192 | depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST |
193 | depends on HAS_DMA | ||
187 | select VIDEOBUF2_DMA_CONTIG | 194 | select VIDEOBUF2_DMA_CONTIG |
188 | default n | 195 | default n |
189 | help | 196 | help |
@@ -193,6 +200,7 @@ config VIDEO_MX2_EMMAPRP | |||
193 | tristate "MX2 eMMa-PrP support" | 200 | tristate "MX2 eMMa-PrP support" |
194 | depends on VIDEO_DEV && VIDEO_V4L2 | 201 | depends on VIDEO_DEV && VIDEO_V4L2 |
195 | depends on SOC_IMX27 || COMPILE_TEST | 202 | depends on SOC_IMX27 || COMPILE_TEST |
203 | depends on HAS_DMA | ||
196 | select VIDEOBUF2_DMA_CONTIG | 204 | select VIDEOBUF2_DMA_CONTIG |
197 | select V4L2_MEM2MEM_DEV | 205 | select V4L2_MEM2MEM_DEV |
198 | help | 206 | help |
@@ -204,6 +212,7 @@ config VIDEO_SAMSUNG_EXYNOS_GSC | |||
204 | tristate "Samsung Exynos G-Scaler driver" | 212 | tristate "Samsung Exynos G-Scaler driver" |
205 | depends on VIDEO_DEV && VIDEO_V4L2 | 213 | depends on VIDEO_DEV && VIDEO_V4L2 |
206 | depends on ARCH_EXYNOS5 || COMPILE_TEST | 214 | depends on ARCH_EXYNOS5 || COMPILE_TEST |
215 | depends on HAS_DMA | ||
207 | select VIDEOBUF2_DMA_CONTIG | 216 | select VIDEOBUF2_DMA_CONTIG |
208 | select V4L2_MEM2MEM_DEV | 217 | select V4L2_MEM2MEM_DEV |
209 | help | 218 | help |
@@ -212,6 +221,7 @@ config VIDEO_SAMSUNG_EXYNOS_GSC | |||
212 | config VIDEO_SH_VEU | 221 | config VIDEO_SH_VEU |
213 | tristate "SuperH VEU mem2mem video processing driver" | 222 | tristate "SuperH VEU mem2mem video processing driver" |
214 | depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA | 223 | depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA |
224 | depends on HAS_DMA | ||
215 | select VIDEOBUF2_DMA_CONTIG | 225 | select VIDEOBUF2_DMA_CONTIG |
216 | select V4L2_MEM2MEM_DEV | 226 | select V4L2_MEM2MEM_DEV |
217 | help | 227 | help |
@@ -221,6 +231,7 @@ config VIDEO_SH_VEU | |||
221 | config VIDEO_RENESAS_VSP1 | 231 | config VIDEO_RENESAS_VSP1 |
222 | tristate "Renesas VSP1 Video Processing Engine" | 232 | tristate "Renesas VSP1 Video Processing Engine" |
223 | depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && HAS_DMA | 233 | depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && HAS_DMA |
234 | depends on HAS_DMA | ||
224 | select VIDEOBUF2_DMA_CONTIG | 235 | select VIDEOBUF2_DMA_CONTIG |
225 | ---help--- | 236 | ---help--- |
226 | This is a V4L2 driver for the Renesas VSP1 video processing engine. | 237 | This is a V4L2 driver for the Renesas VSP1 video processing engine. |
@@ -232,6 +243,7 @@ config VIDEO_TI_VPE | |||
232 | tristate "TI VPE (Video Processing Engine) driver" | 243 | tristate "TI VPE (Video Processing Engine) driver" |
233 | depends on VIDEO_DEV && VIDEO_V4L2 | 244 | depends on VIDEO_DEV && VIDEO_V4L2 |
234 | depends on SOC_DRA7XX || COMPILE_TEST | 245 | depends on SOC_DRA7XX || COMPILE_TEST |
246 | depends on HAS_DMA | ||
235 | select VIDEOBUF2_DMA_CONTIG | 247 | select VIDEOBUF2_DMA_CONTIG |
236 | select V4L2_MEM2MEM_DEV | 248 | select V4L2_MEM2MEM_DEV |
237 | default n | 249 | default n |
diff --git a/drivers/media/platform/blackfin/Kconfig b/drivers/media/platform/blackfin/Kconfig index cc239972fa2c..68fa90151b8f 100644 --- a/drivers/media/platform/blackfin/Kconfig +++ b/drivers/media/platform/blackfin/Kconfig | |||
@@ -1,6 +1,7 @@ | |||
1 | config VIDEO_BLACKFIN_CAPTURE | 1 | config VIDEO_BLACKFIN_CAPTURE |
2 | tristate "Blackfin Video Capture Driver" | 2 | tristate "Blackfin Video Capture Driver" |
3 | depends on VIDEO_V4L2 && BLACKFIN && I2C | 3 | depends on VIDEO_V4L2 && BLACKFIN && I2C |
4 | depends on HAS_DMA | ||
4 | select VIDEOBUF2_DMA_CONTIG | 5 | select VIDEOBUF2_DMA_CONTIG |
5 | help | 6 | help |
6 | V4L2 bridge driver for Blackfin video capture device. | 7 | V4L2 bridge driver for Blackfin video capture device. |
diff --git a/drivers/media/platform/davinci/Kconfig b/drivers/media/platform/davinci/Kconfig index 35809278e349..b04016e8532d 100644 --- a/drivers/media/platform/davinci/Kconfig +++ b/drivers/media/platform/davinci/Kconfig | |||
@@ -2,6 +2,7 @@ config VIDEO_DAVINCI_VPIF_DISPLAY | |||
2 | tristate "TI DaVinci VPIF V4L2-Display driver" | 2 | tristate "TI DaVinci VPIF V4L2-Display driver" |
3 | depends on VIDEO_DEV | 3 | depends on VIDEO_DEV |
4 | depends on ARCH_DAVINCI || COMPILE_TEST | 4 | depends on ARCH_DAVINCI || COMPILE_TEST |
5 | depends on HAS_DMA | ||
5 | select VIDEOBUF2_DMA_CONTIG | 6 | select VIDEOBUF2_DMA_CONTIG |
6 | select VIDEO_ADV7343 if MEDIA_SUBDRV_AUTOSELECT | 7 | select VIDEO_ADV7343 if MEDIA_SUBDRV_AUTOSELECT |
7 | select VIDEO_THS7303 if MEDIA_SUBDRV_AUTOSELECT | 8 | select VIDEO_THS7303 if MEDIA_SUBDRV_AUTOSELECT |
@@ -17,6 +18,7 @@ config VIDEO_DAVINCI_VPIF_CAPTURE | |||
17 | tristate "TI DaVinci VPIF video capture driver" | 18 | tristate "TI DaVinci VPIF video capture driver" |
18 | depends on VIDEO_DEV | 19 | depends on VIDEO_DEV |
19 | depends on ARCH_DAVINCI || COMPILE_TEST | 20 | depends on ARCH_DAVINCI || COMPILE_TEST |
21 | depends on HAS_DMA | ||
20 | select VIDEOBUF2_DMA_CONTIG | 22 | select VIDEOBUF2_DMA_CONTIG |
21 | help | 23 | help |
22 | Enables Davinci VPIF module used for capture devices. | 24 | Enables Davinci VPIF module used for capture devices. |
@@ -30,6 +32,7 @@ config VIDEO_DM6446_CCDC | |||
30 | tristate "TI DM6446 CCDC video capture driver" | 32 | tristate "TI DM6446 CCDC video capture driver" |
31 | depends on VIDEO_V4L2 | 33 | depends on VIDEO_V4L2 |
32 | depends on ARCH_DAVINCI || ARCH_OMAP3 || COMPILE_TEST | 34 | depends on ARCH_DAVINCI || ARCH_OMAP3 || COMPILE_TEST |
35 | depends on HAS_DMA | ||
33 | select VIDEOBUF_DMA_CONTIG | 36 | select VIDEOBUF_DMA_CONTIG |
34 | help | 37 | help |
35 | Enables DaVinci CCD hw module. DaVinci CCDC hw interfaces | 38 | Enables DaVinci CCD hw module. DaVinci CCDC hw interfaces |
@@ -45,6 +48,7 @@ config VIDEO_DM355_CCDC | |||
45 | tristate "TI DM355 CCDC video capture driver" | 48 | tristate "TI DM355 CCDC video capture driver" |
46 | depends on VIDEO_V4L2 | 49 | depends on VIDEO_V4L2 |
47 | depends on ARCH_DAVINCI || COMPILE_TEST | 50 | depends on ARCH_DAVINCI || COMPILE_TEST |
51 | depends on HAS_DMA | ||
48 | select VIDEOBUF_DMA_CONTIG | 52 | select VIDEOBUF_DMA_CONTIG |
49 | help | 53 | help |
50 | Enables DM355 CCD hw module. DM355 CCDC hw interfaces | 54 | Enables DM355 CCD hw module. DM355 CCDC hw interfaces |
@@ -59,6 +63,7 @@ config VIDEO_DM355_CCDC | |||
59 | config VIDEO_DM365_ISIF | 63 | config VIDEO_DM365_ISIF |
60 | tristate "TI DM365 ISIF video capture driver" | 64 | tristate "TI DM365 ISIF video capture driver" |
61 | depends on VIDEO_V4L2 && ARCH_DAVINCI | 65 | depends on VIDEO_V4L2 && ARCH_DAVINCI |
66 | depends on HAS_DMA | ||
62 | select VIDEOBUF_DMA_CONTIG | 67 | select VIDEOBUF_DMA_CONTIG |
63 | help | 68 | help |
64 | Enables ISIF hw module. This is the hardware module for | 69 | Enables ISIF hw module. This is the hardware module for |
@@ -71,6 +76,7 @@ config VIDEO_DM365_ISIF | |||
71 | config VIDEO_DAVINCI_VPBE_DISPLAY | 76 | config VIDEO_DAVINCI_VPBE_DISPLAY |
72 | tristate "TI DaVinci VPBE V4L2-Display driver" | 77 | tristate "TI DaVinci VPBE V4L2-Display driver" |
73 | depends on ARCH_DAVINCI | 78 | depends on ARCH_DAVINCI |
79 | depends on HAS_DMA | ||
74 | select VIDEOBUF2_DMA_CONTIG | 80 | select VIDEOBUF2_DMA_CONTIG |
75 | help | 81 | help |
76 | Enables Davinci VPBE module used for display devices. | 82 | Enables Davinci VPBE module used for display devices. |
diff --git a/drivers/media/platform/exynos4-is/Kconfig b/drivers/media/platform/exynos4-is/Kconfig index 811872195f36..77c951237744 100644 --- a/drivers/media/platform/exynos4-is/Kconfig +++ b/drivers/media/platform/exynos4-is/Kconfig | |||
@@ -16,6 +16,7 @@ config VIDEO_EXYNOS4_IS_COMMON | |||
16 | config VIDEO_S5P_FIMC | 16 | config VIDEO_S5P_FIMC |
17 | tristate "S5P/EXYNOS4 FIMC/CAMIF camera interface driver" | 17 | tristate "S5P/EXYNOS4 FIMC/CAMIF camera interface driver" |
18 | depends on I2C | 18 | depends on I2C |
19 | depends on HAS_DMA | ||
19 | select VIDEOBUF2_DMA_CONTIG | 20 | select VIDEOBUF2_DMA_CONTIG |
20 | select V4L2_MEM2MEM_DEV | 21 | select V4L2_MEM2MEM_DEV |
21 | select MFD_SYSCON | 22 | select MFD_SYSCON |
@@ -43,6 +44,7 @@ if SOC_EXYNOS4212 || SOC_EXYNOS4412 || SOC_EXYNOS5250 | |||
43 | config VIDEO_EXYNOS_FIMC_LITE | 44 | config VIDEO_EXYNOS_FIMC_LITE |
44 | tristate "EXYNOS FIMC-LITE camera interface driver" | 45 | tristate "EXYNOS FIMC-LITE camera interface driver" |
45 | depends on I2C | 46 | depends on I2C |
47 | depends on HAS_DMA | ||
46 | select VIDEOBUF2_DMA_CONTIG | 48 | select VIDEOBUF2_DMA_CONTIG |
47 | select VIDEO_EXYNOS4_IS_COMMON | 49 | select VIDEO_EXYNOS4_IS_COMMON |
48 | help | 50 | help |
@@ -55,6 +57,7 @@ endif | |||
55 | 57 | ||
56 | config VIDEO_EXYNOS4_FIMC_IS | 58 | config VIDEO_EXYNOS4_FIMC_IS |
57 | tristate "EXYNOS4x12 FIMC-IS (Imaging Subsystem) driver" | 59 | tristate "EXYNOS4x12 FIMC-IS (Imaging Subsystem) driver" |
60 | depends on HAS_DMA | ||
58 | select VIDEOBUF2_DMA_CONTIG | 61 | select VIDEOBUF2_DMA_CONTIG |
59 | depends on OF | 62 | depends on OF |
60 | select FW_LOADER | 63 | select FW_LOADER |
diff --git a/drivers/media/platform/marvell-ccic/Kconfig b/drivers/media/platform/marvell-ccic/Kconfig index bf739e3b3398..6265d36adceb 100644 --- a/drivers/media/platform/marvell-ccic/Kconfig +++ b/drivers/media/platform/marvell-ccic/Kconfig | |||
@@ -1,6 +1,7 @@ | |||
1 | config VIDEO_CAFE_CCIC | 1 | config VIDEO_CAFE_CCIC |
2 | tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support" | 2 | tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support" |
3 | depends on PCI && I2C && VIDEO_V4L2 | 3 | depends on PCI && I2C && VIDEO_V4L2 |
4 | depends on HAS_DMA | ||
4 | select VIDEO_OV7670 | 5 | select VIDEO_OV7670 |
5 | select VIDEOBUF2_VMALLOC | 6 | select VIDEOBUF2_VMALLOC |
6 | select VIDEOBUF2_DMA_CONTIG | 7 | select VIDEOBUF2_DMA_CONTIG |
@@ -12,6 +13,7 @@ config VIDEO_CAFE_CCIC | |||
12 | config VIDEO_MMP_CAMERA | 13 | config VIDEO_MMP_CAMERA |
13 | tristate "Marvell Armada 610 integrated camera controller support" | 14 | tristate "Marvell Armada 610 integrated camera controller support" |
14 | depends on ARCH_MMP && I2C && VIDEO_V4L2 | 15 | depends on ARCH_MMP && I2C && VIDEO_V4L2 |
16 | depends on HAS_DMA | ||
15 | select VIDEO_OV7670 | 17 | select VIDEO_OV7670 |
16 | select I2C_GPIO | 18 | select I2C_GPIO |
17 | select VIDEOBUF2_DMA_SG | 19 | select VIDEOBUF2_DMA_SG |
diff --git a/drivers/media/platform/s5p-tv/Kconfig b/drivers/media/platform/s5p-tv/Kconfig index 9f38b3dbe0a8..a9d56f8936b4 100644 --- a/drivers/media/platform/s5p-tv/Kconfig +++ b/drivers/media/platform/s5p-tv/Kconfig | |||
@@ -71,6 +71,7 @@ config VIDEO_SAMSUNG_S5P_MIXER | |||
71 | tristate "Samsung Mixer and Video Processor Driver" | 71 | tristate "Samsung Mixer and Video Processor Driver" |
72 | depends on VIDEO_DEV && VIDEO_V4L2 | 72 | depends on VIDEO_DEV && VIDEO_V4L2 |
73 | depends on VIDEO_SAMSUNG_S5P_TV | 73 | depends on VIDEO_SAMSUNG_S5P_TV |
74 | depends on HAS_DMA | ||
74 | select VIDEOBUF2_DMA_CONTIG | 75 | select VIDEOBUF2_DMA_CONTIG |
75 | help | 76 | help |
76 | Say Y here if you want support for the Mixer in Samsung S5P SoCs. | 77 | Say Y here if you want support for the Mixer in Samsung S5P SoCs. |
diff --git a/drivers/media/platform/soc_camera/Kconfig b/drivers/media/platform/soc_camera/Kconfig index c0d4c0f822ea..6af6c6dccda8 100644 --- a/drivers/media/platform/soc_camera/Kconfig +++ b/drivers/media/platform/soc_camera/Kconfig | |||
@@ -21,6 +21,7 @@ config VIDEO_MX3 | |||
21 | tristate "i.MX3x Camera Sensor Interface driver" | 21 | tristate "i.MX3x Camera Sensor Interface driver" |
22 | depends on VIDEO_DEV && MX3_IPU && SOC_CAMERA | 22 | depends on VIDEO_DEV && MX3_IPU && SOC_CAMERA |
23 | depends on MX3_IPU || COMPILE_TEST | 23 | depends on MX3_IPU || COMPILE_TEST |
24 | depends on HAS_DMA | ||
24 | select VIDEOBUF2_DMA_CONTIG | 25 | select VIDEOBUF2_DMA_CONTIG |
25 | ---help--- | 26 | ---help--- |
26 | This is a v4l2 driver for the i.MX3x Camera Sensor Interface | 27 | This is a v4l2 driver for the i.MX3x Camera Sensor Interface |
@@ -36,6 +37,7 @@ config VIDEO_RCAR_VIN | |||
36 | tristate "R-Car Video Input (VIN) support" | 37 | tristate "R-Car Video Input (VIN) support" |
37 | depends on VIDEO_DEV && SOC_CAMERA | 38 | depends on VIDEO_DEV && SOC_CAMERA |
38 | depends on ARCH_SHMOBILE || COMPILE_TEST | 39 | depends on ARCH_SHMOBILE || COMPILE_TEST |
40 | depends on HAS_DMA | ||
39 | select VIDEOBUF2_DMA_CONTIG | 41 | select VIDEOBUF2_DMA_CONTIG |
40 | select SOC_CAMERA_SCALE_CROP | 42 | select SOC_CAMERA_SCALE_CROP |
41 | ---help--- | 43 | ---help--- |
@@ -52,6 +54,7 @@ config VIDEO_SH_MOBILE_CEU | |||
52 | tristate "SuperH Mobile CEU Interface driver" | 54 | tristate "SuperH Mobile CEU Interface driver" |
53 | depends on VIDEO_DEV && SOC_CAMERA && HAS_DMA && HAVE_CLK | 55 | depends on VIDEO_DEV && SOC_CAMERA && HAS_DMA && HAVE_CLK |
54 | depends on ARCH_SHMOBILE || SUPERH || COMPILE_TEST | 56 | depends on ARCH_SHMOBILE || SUPERH || COMPILE_TEST |
57 | depends on HAS_DMA | ||
55 | select VIDEOBUF2_DMA_CONTIG | 58 | select VIDEOBUF2_DMA_CONTIG |
56 | select SOC_CAMERA_SCALE_CROP | 59 | select SOC_CAMERA_SCALE_CROP |
57 | ---help--- | 60 | ---help--- |
@@ -61,6 +64,7 @@ config VIDEO_OMAP1 | |||
61 | tristate "OMAP1 Camera Interface driver" | 64 | tristate "OMAP1 Camera Interface driver" |
62 | depends on VIDEO_DEV && SOC_CAMERA | 65 | depends on VIDEO_DEV && SOC_CAMERA |
63 | depends on ARCH_OMAP1 || COMPILE_TEST | 66 | depends on ARCH_OMAP1 || COMPILE_TEST |
67 | depends on HAS_DMA | ||
64 | select VIDEOBUF_DMA_CONTIG | 68 | select VIDEOBUF_DMA_CONTIG |
65 | select VIDEOBUF_DMA_SG | 69 | select VIDEOBUF_DMA_SG |
66 | ---help--- | 70 | ---help--- |
@@ -70,6 +74,7 @@ config VIDEO_MX2 | |||
70 | tristate "i.MX27 Camera Sensor Interface driver" | 74 | tristate "i.MX27 Camera Sensor Interface driver" |
71 | depends on VIDEO_DEV && SOC_CAMERA | 75 | depends on VIDEO_DEV && SOC_CAMERA |
72 | depends on SOC_IMX27 || COMPILE_TEST | 76 | depends on SOC_IMX27 || COMPILE_TEST |
77 | depends on HAS_DMA | ||
73 | select VIDEOBUF2_DMA_CONTIG | 78 | select VIDEOBUF2_DMA_CONTIG |
74 | ---help--- | 79 | ---help--- |
75 | This is a v4l2 driver for the i.MX27 Camera Sensor Interface | 80 | This is a v4l2 driver for the i.MX27 Camera Sensor Interface |
@@ -78,6 +83,7 @@ config VIDEO_ATMEL_ISI | |||
78 | tristate "ATMEL Image Sensor Interface (ISI) support" | 83 | tristate "ATMEL Image Sensor Interface (ISI) support" |
79 | depends on VIDEO_DEV && SOC_CAMERA | 84 | depends on VIDEO_DEV && SOC_CAMERA |
80 | depends on ARCH_AT91 || COMPILE_TEST | 85 | depends on ARCH_AT91 || COMPILE_TEST |
86 | depends on HAS_DMA | ||
81 | select VIDEOBUF2_DMA_CONTIG | 87 | select VIDEOBUF2_DMA_CONTIG |
82 | ---help--- | 88 | ---help--- |
83 | This module makes the ATMEL Image Sensor Interface available | 89 | This module makes the ATMEL Image Sensor Interface available |
diff --git a/drivers/staging/media/davinci_vpfe/Kconfig b/drivers/staging/media/davinci_vpfe/Kconfig index 12f321dd2399..4de2f082491d 100644 --- a/drivers/staging/media/davinci_vpfe/Kconfig +++ b/drivers/staging/media/davinci_vpfe/Kconfig | |||
@@ -1,6 +1,7 @@ | |||
1 | config VIDEO_DM365_VPFE | 1 | config VIDEO_DM365_VPFE |
2 | tristate "DM365 VPFE Media Controller Capture Driver" | 2 | tristate "DM365 VPFE Media Controller Capture Driver" |
3 | depends on VIDEO_V4L2 && ARCH_DAVINCI_DM365 && !VIDEO_DM365_ISIF | 3 | depends on VIDEO_V4L2 && ARCH_DAVINCI_DM365 && !VIDEO_DM365_ISIF |
4 | depends on HAS_DMA | ||
4 | select VIDEOBUF2_DMA_CONTIG | 5 | select VIDEOBUF2_DMA_CONTIG |
5 | help | 6 | help |
6 | Support for DM365 VPFE based Media Controller Capture driver. | 7 | Support for DM365 VPFE based Media Controller Capture driver. |
diff --git a/drivers/staging/media/dt3155v4l/Kconfig b/drivers/staging/media/dt3155v4l/Kconfig index 226a1ca90b3c..2d496001b6e8 100644 --- a/drivers/staging/media/dt3155v4l/Kconfig +++ b/drivers/staging/media/dt3155v4l/Kconfig | |||
@@ -1,6 +1,7 @@ | |||
1 | config VIDEO_DT3155 | 1 | config VIDEO_DT3155 |
2 | tristate "DT3155 frame grabber, Video4Linux interface" | 2 | tristate "DT3155 frame grabber, Video4Linux interface" |
3 | depends on PCI && VIDEO_DEV && VIDEO_V4L2 | 3 | depends on PCI && VIDEO_DEV && VIDEO_V4L2 |
4 | depends on HAS_DMA | ||
4 | select VIDEOBUF2_DMA_CONTIG | 5 | select VIDEOBUF2_DMA_CONTIG |
5 | default n | 6 | default n |
6 | ---help--- | 7 | ---help--- |
diff --git a/drivers/staging/media/omap4iss/Kconfig b/drivers/staging/media/omap4iss/Kconfig index 8afc6fee40c5..b78643f907e7 100644 --- a/drivers/staging/media/omap4iss/Kconfig +++ b/drivers/staging/media/omap4iss/Kconfig | |||
@@ -1,6 +1,7 @@ | |||
1 | config VIDEO_OMAP4 | 1 | config VIDEO_OMAP4 |
2 | bool "OMAP 4 Camera support" | 2 | bool "OMAP 4 Camera support" |
3 | depends on VIDEO_V4L2=y && VIDEO_V4L2_SUBDEV_API && I2C=y && ARCH_OMAP4 | 3 | depends on VIDEO_V4L2=y && VIDEO_V4L2_SUBDEV_API && I2C=y && ARCH_OMAP4 |
4 | depends on HAS_DMA | ||
4 | select VIDEOBUF2_DMA_CONTIG | 5 | select VIDEOBUF2_DMA_CONTIG |
5 | ---help--- | 6 | ---help--- |
6 | Driver for an OMAP 4 ISS controller. | 7 | Driver for an OMAP 4 ISS controller. |