From: Tao Jing Date: Fri, 18 Nov 2011 10:06:29 +0000 (+0800) Subject: video config: add for camera part X-Git-Tag: 2.1b_release~1868 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=978f6d4efe2e2cf7936e1345385f58da5d8c0d1b;p=kernel%2Fkernel-mfld-blackbay.git video config: add for camera part adding for lm3554, mt9e013, mt9m114 Change-Id: Ibfe770c1371f2b9a1cd294e4347737e87bac91c3 Signed-off-by: Tao Jing Reviewed-on: http://android.intel.com:8080/24504 Reviewed-by: buildbot Reviewed-by: Gross, Mark Tested-by: Gross, Mark Reviewed-on: http://android.intel.com:8080/24691 --- diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index bb53de7..bf54190 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -300,6 +300,16 @@ config VIDEO_BT866 To compile this driver as a module, choose M here: the module will be called bt866. +config VIDEO_LM3554 + tristate "LM3554 flash light driver" + depends on VIDEO_V4L2 && I2C + ---help--- + This is a Video4Linux2 sub-dev driver for the LM3554 + flash light driver. + + To compile this driver as a module, choose M here: the + module will be called lm3554 + config VIDEO_KS0127 tristate "KS0127 video decoder" depends on VIDEO_V4L2 && I2C @@ -311,6 +321,27 @@ config VIDEO_KS0127 To compile this driver as a module, choose M here: the module will be called ks0127. +config VIDEO_MT9E013 + tristate "Micron mt9e013 sensor support" + depends on I2C && VIDEO_V4L2 + ---help--- + This is a Video4Linux2 sensor-level driver for the Micron + mt0v011 1.3 Mpixel camera. + + 9me013 is 8MP RAW sensor. + + It currently only works with the atomisp driver. + +config VIDEO_MT9M114 + tristate "Aptina mt9m114 sensor support" + depends on I2C && VIDEO_V4L2 + ---help--- + This is a Video4Linux2 sensor-level driver for the Micron + mt9m114 1.3 Mpixel camera. + + mt9m114 is video camrea sensor. + + It currently only works with the atomisp driver. config VIDEO_SAA7110 tristate "Philips SAA7110 video decoder" @@ -961,6 +992,8 @@ config VIDEO_S5P_MIPI_CSIS To compile this driver as a module, choose M here: the module will be called s5p-csis. +source "drivers/media/video/atomisp/Kconfig" + # # USB Multimedia device configuration # diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index f0fecd6..18bcc25 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile @@ -71,6 +71,12 @@ obj-$(CONFIG_VIDEO_SR030PC30) += sr030pc30.o obj-$(CONFIG_VIDEO_NOON010PC30) += noon010pc30.o obj-$(CONFIG_VIDEO_M5MOLS) += m5mols/ +obj-$(CONFIG_VIDEO_LM3555) += lm3555.o +obj-$(CONFIG_VIDEO_LM3554) += lm3554.o + +obj-$(CONFIG_VIDEO_MT9E013) += mt9e013.o +obj-$(CONFIG_VIDEO_MT9M114) += mt9m114.o + obj-$(CONFIG_SOC_CAMERA_IMX074) += imx074.o obj-$(CONFIG_SOC_CAMERA_MT9M001) += mt9m001.o obj-$(CONFIG_SOC_CAMERA_MT9M111) += mt9m111.o @@ -184,6 +190,8 @@ obj-y += davinci/ obj-$(CONFIG_ARCH_OMAP) += omap/ +obj-$(CONFIG_VIDEO_ATOMISP) += atomisp/ + EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core EXTRA_CFLAGS += -Idrivers/media/dvb/frontends EXTRA_CFLAGS += -Idrivers/media/common/tuners