diff options
| author | guoyin.chen <guoyin.chen@freescale.com> | 2012-02-16 14:01:39 +0800 |
|---|---|---|
| committer | guoyin.chen <guoyin.chen@freescale.com> | 2012-02-16 14:01:39 +0800 |
| commit | 8121724876b4f30547ffc9928f1db33f34ed86e7 (patch) | |
| tree | 3b0648107979279073ecfbd0b61426ef93ddb5f4 /drivers/media | |
| parent | 84c89d0f4db2ed1f547b1688701e0403a56957c4 (diff) | |
ENGR00174526-1 camera: fix the conflict of dual camera
make the ov5640 mipi not within the choice of all camera module
remove the sensor_clock redefine for dual camera
Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/mxc/capture/Kconfig | 18 | ||||
| -rw-r--r-- | drivers/media/video/mxc/capture/Makefile | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/drivers/media/video/mxc/capture/Kconfig b/drivers/media/video/mxc/capture/Kconfig index 3b2d90f9fd0a..f82defaacca4 100644 --- a/drivers/media/video/mxc/capture/Kconfig +++ b/drivers/media/video/mxc/capture/Kconfig @@ -76,14 +76,6 @@ config MXC_CAMERA_OV5640 ---help--- If you plan to use the ov5640 Camera with your MXC system, say Y here. -config MXC_CAMERA_OV5640_MIPI - tristate "OmniVision ov5640 camera support using mipi" - depends on !VIDEO_MXC_EMMA_CAMERA - depends on ARCH_MX6Q - select MXC_MIPI_CSI2 if ARCH_MX6Q - ---help--- - If you plan to use the ov5640 Camera with mipi interface in your MXC system, say Y here. - config MXC_CAMERA_OV8820_MIPI tristate "OmniVision ov8820 camera support using mipi" depends on !VIDEO_MXC_EMMA_CAMERA @@ -106,6 +98,16 @@ config MXC_TVIN_ADV7180 endchoice +config MXC_CAMERA_OV5640_MIPI + tristate "OmniVision ov5640 camera support using mipi" + depends on !VIDEO_MXC_EMMA_CAMERA + depends on ARCH_MX6Q + depends on VIDEO_MXC_CAMERA + select MXC_MIPI_CSI2 if ARCH_MX6Q + ---help--- + If you plan to use the ov5640 Camera with mipi interface in your MXC system, say Y here. + + config MXC_IPU_PRP_VF_SDC tristate "Pre-Processor VF SDC library" depends on VIDEO_MXC_IPU_CAMERA && FB_MXC_SYNC_PANEL diff --git a/drivers/media/video/mxc/capture/Makefile b/drivers/media/video/mxc/capture/Makefile index 8dab021fa64f..3fd6afaa7deb 100644 --- a/drivers/media/video/mxc/capture/Makefile +++ b/drivers/media/video/mxc/capture/Makefile @@ -37,7 +37,7 @@ obj-$(CONFIG_MXC_CAMERA_OV3640) += ov3640_camera.o ov5640_camera-objs := ov5640.o sensor_clock.o obj-$(CONFIG_MXC_CAMERA_OV5640) += ov5640_camera.o -ov5640_camera_mipi-objs := ov5640_mipi.o sensor_clock.o +ov5640_camera_mipi-objs := ov5640_mipi.o obj-$(CONFIG_MXC_CAMERA_OV5640_MIPI) += ov5640_camera_mipi.o ov8820_camera_mipi-objs := ov8820_mipi.o sensor_clock.o |