Move the imx074 driver to the soc_camera directory in the media staging
tree.
Signed-off-by: Sakari Ailus <sakari.ai...@linux.intel.com>
---
drivers/staging/media/Kconfig | 2 --
drivers/staging/media/Makefile | 1 -
drivers/staging/media/imx074/Kconfig | 5 -----
drivers/staging/media/imx074/Makefile | 1 -
drivers/staging/media/imx074/TODO | 5 -----
drivers/staging/media/soc_camera/Kconfig | 7 +++++++
drivers/staging/media/soc_camera/Makefile | 1 +
drivers/staging/media/{imx074 => soc_camera}/imx074.c | 0
8 files changed, 8 insertions(+), 14 deletions(-)
delete mode 100644 drivers/staging/media/imx074/Kconfig
delete mode 100644 drivers/staging/media/imx074/Makefile
delete mode 100644 drivers/staging/media/imx074/TODO
rename drivers/staging/media/{imx074 => soc_camera}/imx074.c (100%)
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 7c3f443f27358..fce8933216241 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/imx074/Kconfig"
-
source "drivers/staging/media/mt9t031/Kconfig"
source "drivers/staging/media/omap4iss/Kconfig"
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 9c1bb862f5c92..74920289b0d94 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_IMX074) += imx074/
obj-$(CONFIG_SOC_CAMERA_MT9T031) += mt9t031/
obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/
obj-$(CONFIG_VIDEO_OMAP4) += omap4iss/
diff --git a/drivers/staging/media/imx074/Kconfig
b/drivers/staging/media/imx074/Kconfig
deleted file mode 100644
index 229cbeea580b0..0000000000000
--- a/drivers/staging/media/imx074/Kconfig
+++ /dev/null
@@ -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
diff --git a/drivers/staging/media/imx074/Makefile
b/drivers/staging/media/imx074/Makefile
deleted file mode 100644
index 7d183574aa840..0000000000000
--- a/drivers/staging/media/imx074/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-$(CONFIG_SOC_CAMERA_IMX074) += imx074.o
diff --git a/drivers/staging/media/imx074/TODO
b/drivers/staging/media/imx074/TODO
deleted file mode 100644
index 15580a4f950c5..0000000000000
--- a/drivers/staging/media/imx074/TODO
+++ /dev/null
@@ -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.
diff --git a/drivers/staging/media/soc_camera/Kconfig
b/drivers/staging/media/soc_camera/Kconfig
index ebd78cebd4ecb..e6bd04840971c 100644
--- a/drivers/staging/media/soc_camera/Kconfig
+++ b/drivers/staging/media/soc_camera/Kconfig
@@ -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
diff --git a/drivers/staging/media/soc_camera/Makefile
b/drivers/staging/media/soc_camera/Makefile
index e03450cee5249..09560dc32c4c7 100644
--- a/drivers/staging/media/soc_camera/Makefile
+++ b/drivers/staging/media/soc_camera/Makefile
@@ -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
diff --git a/drivers/staging/media/imx074/imx074.c
b/drivers/staging/media/soc_camera/imx074.c
similarity index 100%
rename from drivers/staging/media/imx074/imx074.c
rename to drivers/staging/media/soc_camera/imx074.c
--
2.11.0
