diff options
| author | Laurent Pinchart <laurent.pinchart@linaro.org> | 2015-04-27 01:14:01 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@linaro.org> | 2015-04-28 21:03:13 +0300 |
| commit | faced1822d20d8c45da7864595230c5857b9463e (patch) | |
| tree | 8e1fbf1b2a1bc70b68b7c676324c13a8bf1a81f7 | |
| parent | 7a1309e68f9473474a3b217e17c3d6c824d2d2f5 (diff) | |
media: s5k8aa: Move driver to drivers/media/i2c/
The driver doesn't depend on soc-camera anymore, move it to the media
I2C drivers directory.
Signed-off-by: Laurent Pinchart <laurent.pinchart@linaro.org>
Acked-By: Vaibhav Hiremath <vaibhav.hiremath@linaro.org>
| -rw-r--r-- | drivers/media/i2c/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/media/i2c/Makefile | 1 | ||||
| -rw-r--r-- | drivers/media/i2c/s5k8aa.c (renamed from drivers/media/i2c/soc_camera/s5k8aa.c) | 0 | ||||
| -rw-r--r-- | drivers/media/i2c/soc_camera/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/media/i2c/soc_camera/Makefile | 3 |
5 files changed, 9 insertions, 8 deletions
diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index a0e5a949811c..f3c583245663 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -555,6 +555,13 @@ config VIDEO_S5K4ECGX This is a V4L2 sensor-level driver for Samsung S5K4ECGX 5M camera sensor with an embedded SoC image signal processor. +config VIDEO_S5K8AA + tristate "Samsung S5K8AA sensor support" + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + ---help--- + This is a V4L2 sensor-level driver for Samsung S5K8AA 1.2M + camera sensor with an embedded SoC image signal processor. + source "drivers/media/i2c/smiapp/Kconfig" config VIDEO_S5C73M3 diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile index e86e07871466..a439689a9ca1 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -66,6 +66,7 @@ obj-$(CONFIG_VIDEO_SR030PC30) += sr030pc30.o obj-$(CONFIG_VIDEO_NOON010PC30) += noon010pc30.o obj-$(CONFIG_VIDEO_S5K6AA) += s5k6aa.o obj-$(CONFIG_VIDEO_S5K4ECGX) += s5k4ecgx.o +obj-$(CONFIG_VIDEO_S5K8AA) += s5k8aa.o obj-$(CONFIG_VIDEO_S5C73M3) += s5c73m3/ obj-$(CONFIG_VIDEO_ADP1653) += adp1653.o obj-$(CONFIG_VIDEO_AS3645A) += as3645a.o diff --git a/drivers/media/i2c/soc_camera/s5k8aa.c b/drivers/media/i2c/s5k8aa.c index 4fabfdd80c79..4fabfdd80c79 100644 --- a/drivers/media/i2c/soc_camera/s5k8aa.c +++ b/drivers/media/i2c/s5k8aa.c diff --git a/drivers/media/i2c/soc_camera/Kconfig b/drivers/media/i2c/soc_camera/Kconfig index 1ef49491a703..4ca63c896e89 100644 --- a/drivers/media/i2c/soc_camera/Kconfig +++ b/drivers/media/i2c/soc_camera/Kconfig @@ -86,12 +86,6 @@ config SOC_CAMERA_TW9910 help This is a tw9910 video driver -config SOC_CAMERA_S5K8AA - tristate "S5K8AA camera support" - depends on SOC_CAMERA && I2C - help - This is a V4L2 camera driver for the s5k8aa sensor - config SOC_CAMERA_SP1628 tristate "sp1628 support based on ECS" depends on SOC_CAMERA && I2C diff --git a/drivers/media/i2c/soc_camera/Makefile b/drivers/media/i2c/soc_camera/Makefile index 00bfbe23836f..7031f49ca72d 100644 --- a/drivers/media/i2c/soc_camera/Makefile +++ b/drivers/media/i2c/soc_camera/Makefile @@ -12,5 +12,4 @@ obj-$(CONFIG_SOC_CAMERA_OV9640) += ov9640.o obj-$(CONFIG_SOC_CAMERA_OV9740) += ov9740.o obj-$(CONFIG_SOC_CAMERA_RJ54N1) += rj54n1cb0c.o obj-$(CONFIG_SOC_CAMERA_TW9910) += tw9910.o -obj-$(CONFIG_SOC_CAMERA_S5K8AA) += s5k8aa.o -obj-$(CONFIG_SOC_CAMERA_SP1628) += sp1628.o
\ No newline at end of file +obj-$(CONFIG_SOC_CAMERA_SP1628) += sp1628.o |