-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[media] move soc_camera to its own directory
That helps to better organize the soc_camera items. While here, cleanup Makefiles, removing uneeded include dirs. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
- Loading branch information
Mauro Carvalho Chehab
committed
Aug 21, 2012
1 parent
7ba2f84
commit b47ff4a
Showing
15 changed files
with
114 additions
and
121 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| config SOC_CAMERA | ||
| tristate "SoC camera support" | ||
| depends on VIDEO_V4L2 && HAS_DMA && I2C | ||
| select VIDEOBUF_GEN | ||
| select VIDEOBUF2_CORE | ||
| help | ||
| SoC Camera is a common API to several cameras, not connecting | ||
| over a bus like PCI or USB. For example some i2c camera connected | ||
| directly to the data bus of an SoC. | ||
|
|
||
| config SOC_CAMERA_PLATFORM | ||
| tristate "platform camera support" | ||
| depends on SOC_CAMERA | ||
| help | ||
| This is a generic SoC camera platform driver, useful for testing | ||
|
|
||
| config MX1_VIDEO | ||
| bool | ||
|
|
||
| config VIDEO_MX1 | ||
| tristate "i.MX1/i.MXL CMOS Sensor Interface driver" | ||
| depends on VIDEO_DEV && ARCH_MX1 && SOC_CAMERA | ||
| select FIQ | ||
| select VIDEOBUF_DMA_CONTIG | ||
| select MX1_VIDEO | ||
| ---help--- | ||
| This is a v4l2 driver for the i.MX1/i.MXL CMOS Sensor Interface | ||
|
|
||
| config MX3_VIDEO | ||
| bool | ||
|
|
||
| config VIDEO_MX3 | ||
| tristate "i.MX3x Camera Sensor Interface driver" | ||
| depends on VIDEO_DEV && MX3_IPU && SOC_CAMERA | ||
| select VIDEOBUF2_DMA_CONTIG | ||
| select MX3_VIDEO | ||
| ---help--- | ||
| This is a v4l2 driver for the i.MX3x Camera Sensor Interface | ||
|
|
||
| config VIDEO_PXA27x | ||
| tristate "PXA27x Quick Capture Interface driver" | ||
| depends on VIDEO_DEV && PXA27x && SOC_CAMERA | ||
| select VIDEOBUF_DMA_SG | ||
| ---help--- | ||
| This is a v4l2 driver for the PXA27x Quick Capture Interface | ||
|
|
||
| config VIDEO_SH_MOBILE_CSI2 | ||
| tristate "SuperH Mobile MIPI CSI-2 Interface driver" | ||
| depends on VIDEO_DEV && SOC_CAMERA && HAVE_CLK | ||
| ---help--- | ||
| This is a v4l2 driver for the SuperH MIPI CSI-2 Interface | ||
|
|
||
| config VIDEO_SH_MOBILE_CEU | ||
| tristate "SuperH Mobile CEU Interface driver" | ||
| depends on VIDEO_DEV && SOC_CAMERA && HAS_DMA && HAVE_CLK | ||
| select VIDEOBUF2_DMA_CONTIG | ||
| ---help--- | ||
| This is a v4l2 driver for the SuperH Mobile CEU Interface | ||
|
|
||
| config VIDEO_OMAP1 | ||
| tristate "OMAP1 Camera Interface driver" | ||
| depends on VIDEO_DEV && ARCH_OMAP1 && SOC_CAMERA | ||
| select VIDEOBUF_DMA_CONTIG | ||
| select VIDEOBUF_DMA_SG | ||
| ---help--- | ||
| This is a v4l2 driver for the TI OMAP1 camera interface | ||
|
|
||
| config VIDEO_MX2_HOSTSUPPORT | ||
| bool | ||
|
|
||
| config VIDEO_MX2 | ||
| tristate "i.MX27/i.MX25 Camera Sensor Interface driver" | ||
| depends on VIDEO_DEV && SOC_CAMERA && (MACH_MX27 || (ARCH_MX25 && BROKEN)) | ||
| select VIDEOBUF2_DMA_CONTIG | ||
| select VIDEO_MX2_HOSTSUPPORT | ||
| ---help--- | ||
| This is a v4l2 driver for the i.MX27 and the i.MX25 Camera Sensor | ||
| Interface | ||
|
|
||
| config VIDEO_ATMEL_ISI | ||
| tristate "ATMEL Image Sensor Interface (ISI) support" | ||
| depends on VIDEO_DEV && SOC_CAMERA && ARCH_AT91 | ||
| select VIDEOBUF2_DMA_CONTIG | ||
| ---help--- | ||
| This module makes the ATMEL Image Sensor Interface available | ||
| as a v4l2 device. | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| obj-$(CONFIG_SOC_CAMERA) += soc_camera.o soc_mediabus.o | ||
| obj-$(CONFIG_SOC_CAMERA_PLATFORM) += soc_camera_platform.o | ||
|
|
||
| # soc-camera host drivers have to be linked after camera drivers | ||
| obj-$(CONFIG_VIDEO_ATMEL_ISI) += atmel-isi.o | ||
| obj-$(CONFIG_VIDEO_MX1) += mx1_camera.o | ||
| obj-$(CONFIG_VIDEO_MX2) += mx2_camera.o | ||
| obj-$(CONFIG_VIDEO_MX3) += mx3_camera.o | ||
| obj-$(CONFIG_VIDEO_OMAP1) += omap1_camera.o | ||
| obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o | ||
| obj-$(CONFIG_VIDEO_SH_MOBILE_CEU) += sh_mobile_ceu_camera.o | ||
| obj-$(CONFIG_VIDEO_SH_MOBILE_CSI2) += sh_mobile_csi2.o | ||
|
|
||
| ccflags-y += -I$(srctree)/drivers/media/i2c/soc_camera |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.