iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: soc_camera: Move the imx074 under soc_camera directory

Browse Source 
Move the imx074 driver to the soc_camera directory in the media staging
tree.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Sakari Ailus 2019-02-07 08:47:01 -05:00 committed by Mauro Carvalho Chehab
parent 280de94a65
commit 045f95e773
8 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/media/Kconfig
View File

@ -25,8 +25,6 @@ source "drivers/staging/media/davinci_vpfe/Kconfig"
source "drivers/staging/media/imx/Kconfig"
source "drivers/staging/media/imx074/Kconfig"
source "drivers/staging/media/mt9t031/Kconfig"
source "drivers/staging/media/omap4iss/Kconfig"

1
drivers/staging/media/Makefile
View File

@ -1,7 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_I2C_BCM2048) += bcm2048/
obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx/
obj-$(CONFIG_SOC_CAMERA_IMX074) += imx074/
obj-$(CONFIG_SOC_CAMERA_MT9T031) += mt9t031/
obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/
obj-$(CONFIG_VIDEO_OMAP4) += omap4iss/

5
drivers/staging/media/imx074/Kconfig
View File

@ -1,5 +0,0 @@
config SOC_CAMERA_IMX074
tristate "imx074 support (DEPRECATED)"
depends on SOC_CAMERA && I2C
help
This driver supports IMX074 cameras from Sony

1
drivers/staging/media/imx074/Makefile
View File

@ -1 +0,0 @@
obj-$(CONFIG_SOC_CAMERA_IMX074) += imx074.o

5
drivers/staging/media/imx074/TODO
View File

@ -1,5 +0,0 @@
This sensor driver needs to be converted to a regular
v4l2 subdev driver. The soc_camera framework is deprecated and
will be removed in the future. Unless someone does this work this
sensor driver will be deleted when the soc_camera framework is
deleted.

7
drivers/staging/media/soc_camera/Kconfig
View File

@ -6,6 +6,7 @@ config SOC_CAMERA
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.
comment "soc_camera sensor drivers"
config SOC_CAMERA_MT9M111
@ -35,3 +36,9 @@ config SOC_CAMERA_OV9740
depends on SOC_CAMERA && I2C
help
This is a ov9740 camera driver
config SOC_CAMERA_IMX074
tristate "imx074 support (DEPRECATED)"
depends on SOC_CAMERA && I2C
help
This driver supports IMX074 cameras from Sony

1
drivers/staging/media/soc_camera/Makefile
View File

@ -3,3 +3,4 @@ obj-$(CONFIG_SOC_CAMERA) += soc_camera.o soc_mediabus.o
obj-$(CONFIG_SOC_CAMERA_MT9V022) += soc_mt9v022.o
obj-$(CONFIG_SOC_CAMERA_OV5642) += soc_ov5642.o
obj-$(CONFIG_SOC_CAMERA_OV9740) += soc_ov9740.o
obj-$(CONFIG_SOC_CAMERA_IMX074) += imx074.o

0
drivers/staging/media/imx074/imx074.c → drivers/staging/media/soc_camera/imx074.c
View File