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/media/platform/Kconfig | |
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/media/platform/Kconfig')
-rw-r--r-- | drivers/media/platform/Kconfig | 12 |
1 files changed, 12 insertions, 0 deletions
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 |