From: Sakari Ailus Date: Thu, 7 Feb 2019 13:48:28 +0000 (-0500) Subject: media: soc_camera: Move the mt9t031 under soc_camera directory X-Git-Tag: v5.1-rc1~88^2~96 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc548ee0773bedf74a162e761b3bf487bb84270b;p=thirdparty%2Fkernel%2Flinux.git media: soc_camera: Move the mt9t031 under soc_camera directory Move the mt9t031 driver to the soc_camera directory in the media staging tree. Signed-off-by: Sakari Ailus Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig index fce8933216241..1da5c20d65c04 100644 --- a/drivers/staging/media/Kconfig +++ b/drivers/staging/media/Kconfig @@ -25,8 +25,6 @@ source "drivers/staging/media/davinci_vpfe/Kconfig" source "drivers/staging/media/imx/Kconfig" -source "drivers/staging/media/mt9t031/Kconfig" - source "drivers/staging/media/omap4iss/Kconfig" source "drivers/staging/media/rockchip/vpu/Kconfig" diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile index 74920289b0d94..0355e3030504d 100644 --- a/drivers/staging/media/Makefile +++ b/drivers/staging/media/Makefile @@ -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_MT9T031) += mt9t031/ obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/ obj-$(CONFIG_VIDEO_OMAP4) += omap4iss/ obj-$(CONFIG_VIDEO_SUNXI) += sunxi/ diff --git a/drivers/staging/media/soc_camera/Kconfig b/drivers/staging/media/soc_camera/Kconfig index e6bd04840971c..6a6aa6d2d150e 100644 --- a/drivers/staging/media/soc_camera/Kconfig +++ b/drivers/staging/media/soc_camera/Kconfig @@ -42,3 +42,9 @@ config SOC_CAMERA_IMX074 depends on SOC_CAMERA && I2C help This driver supports IMX074 cameras from Sony + +config SOC_CAMERA_MT9T031 + tristate "mt9t031 support (DEPRECATED)" + depends on SOC_CAMERA && I2C + help + This driver supports MT9T031 cameras from Micron. diff --git a/drivers/staging/media/soc_camera/Makefile b/drivers/staging/media/soc_camera/Makefile index 09560dc32c4c7..3a351bd629f59 100644 --- a/drivers/staging/media/soc_camera/Makefile +++ b/drivers/staging/media/soc_camera/Makefile @@ -4,3 +4,4 @@ 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 +obj-$(CONFIG_SOC_CAMERA_MT9T031) += mt9t031.o diff --git a/drivers/staging/media/mt9t031/mt9t031.c b/drivers/staging/media/soc_camera/mt9t031.c similarity index 100% rename from drivers/staging/media/mt9t031/mt9t031.c rename to drivers/staging/media/soc_camera/mt9t031.c