diff options
| author | Werner Almesberger <werner@openmoko.org> | 2009-03-05 14:39:57 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-03-05 14:39:57 +0000 |
| commit | 068527fc6e416d1e2673429721c1dd4f25285655 (patch) | |
| tree | 23c1a1f465075bc204183fceab425d71e5b16daa /drivers/media | |
| parent | 01ca50a5b8b0e1feb9cff8d93314e87a91f09efe (diff) | |
Samsung S3C camera subsystem config and Makefile
Add Samsung S3C camera subsystem to kernel configuration and build process.
Original code is from Samsung's BSP.
Signed-off-by: Werner Almesberger <werner@openmoko.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/Kconfig | 19 | ||||
| -rw-r--r-- | drivers/media/video/Makefile | 2 |
2 files changed, 21 insertions, 0 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 19cf3b8f67c..d6ef2fb4f66 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -711,6 +711,25 @@ config VIDEO_CAFE_CCIC CMOS camera controller. This is the controller found on first- generation OLPC systems. +config VIDEO_SAMSUNG + bool "S3C SMDK CAMERA support" + depends on VIDEO_V4L2 + + default n + ---help--- + TBA + +choice +depends on VIDEO_SAMSUNG +prompt "Select CIS module type" +default VIDEO_SAMSUNG_S5K3BA + +config VIDEO_SAMSUNG_S5K4BA + bool "S5K4BA (2.0M CIS module, 1600x1200)" + ---help--- + TBA +endchoice + config SOC_CAMERA tristate "SoC camera support" depends on VIDEO_V4L2 && HAS_DMA diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index 72f6d03d2d8..55cbf3e2106 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile @@ -134,6 +134,8 @@ obj-$(CONFIG_VIDEO_CX18) += cx18/ obj-$(CONFIG_VIDEO_VIVI) += vivi.o obj-$(CONFIG_VIDEO_CX23885) += cx23885/ +obj-$(CONFIG_VIDEO_SAMSUNG) += s3c_camera_driver.o s3c_camif.o samsung/ + obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o obj-$(CONFIG_VIDEO_SH_MOBILE_CEU) += sh_mobile_ceu_camera.o obj-$(CONFIG_VIDEO_OMAP2) += omap2cam.o |