soc_camera/mx2_camera.c: move to staging in preparation,for removal

This driver is deprecated: it should become a stand-alone driver instead of using the soc-camera framework.

Unless someone is willing to take this on (unlikely with such ancient hardware) it is going to be removed from the kernel soon.

Signed-off-by Hans Verkuil <[email protected]>

---
 drivers/media/platform/soc_camera/Kconfig                    |  9 ---------
 drivers/media/platform/soc_camera/Makefile                   |  1 -
 drivers/staging/media/Kconfig                                |  2 ++
 drivers/staging/media/Makefile                               |  1 +
 drivers/staging/media/mx2/Kconfig                            | 12 ++++++++++++
 drivers/staging/media/mx2/Makefile                           |  3 +++
 .../platform/soc_camera => staging/media/mx2}/mx2_camera.c   |  0
 7 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100644 drivers/staging/media/mx2/Kconfig
 create mode 100644 drivers/staging/media/mx2/Makefile
 rename drivers/{media/platform/soc_camera => staging/media/mx2}/mx2_camera.c (100%)

drivers/media/platform/soc_camera/Kconfig +0 -9

index 954dd36..449ab78 100644
@@ -60,15 +60,6 @@ config VIDEO_SH_MOBILE_CEU
 	---help---
 	  This is a v4l2 driver for the SuperH Mobile CEU Interface
 
-config VIDEO_MX2
-	tristate "i.MX27 Camera Sensor Interface driver"
-	depends on VIDEO_DEV && SOC_CAMERA
-	depends on SOC_IMX27 || COMPILE_TEST
-	depends on HAS_DMA
-	select VIDEOBUF2_DMA_CONTIG
-	---help---
-	  This is a v4l2 driver for the i.MX27 Camera Sensor Interface
-
 config VIDEO_ATMEL_ISI
 	tristate "ATMEL Image Sensor Interface (ISI) support"
 	depends on VIDEO_DEV && SOC_CAMERA

drivers/media/platform/soc_camera/Makefile +0 -1

index bdd7fc9..dad56b9 100644
@@ -7,7 +7,6 @@ obj-$(CONFIG_SOC_CAMERA_PLATFORM)	+= soc_camera_platform.o
 
 # soc-camera host drivers have to be linked after camera drivers
 obj-$(CONFIG_VIDEO_ATMEL_ISI)		+= atmel-isi.o
-obj-$(CONFIG_VIDEO_MX2)			+= mx2_camera.o
 obj-$(CONFIG_VIDEO_MX3)			+= mx3_camera.o
 obj-$(CONFIG_VIDEO_PXA27x)		+= pxa_camera.o
 obj-$(CONFIG_VIDEO_SH_MOBILE_CEU)	+= sh_mobile_ceu_camera.o

drivers/staging/media/Kconfig +2 -0

index 382d868..11d62b2 100644
@@ -29,6 +29,8 @@ source "drivers/staging/media/mn88472/Kconfig"
 
 source "drivers/staging/media/mn88473/Kconfig"
 
+source "drivers/staging/media/mx2/Kconfig"
+
 source "drivers/staging/media/omap1/Kconfig"
 
 source "drivers/staging/media/omap4iss/Kconfig"

drivers/staging/media/Makefile +1 -0

index 89d038c..d3ff2d0 100644
@@ -2,6 +2,7 @@ obj-$(CONFIG_I2C_BCM2048)	+= bcm2048/
 obj-$(CONFIG_DVB_CXD2099)	+= cxd2099/
 obj-$(CONFIG_LIRC_STAGING)	+= lirc/
 obj-$(CONFIG_VIDEO_DM365_VPFE)	+= davinci_vpfe/
+obj-$(CONFIG_VIDEO_MX2)		+= mx2/
 obj-$(CONFIG_VIDEO_OMAP1)	+= omap1/
 obj-$(CONFIG_VIDEO_OMAP4)	+= omap4iss/
 obj-$(CONFIG_DVB_MN88472)       += mn88472/

drivers/staging/media/mx2/Kconfig new file +12 -0

new file mode 100644
index 0000000..e080ab9
@@ -0,0 +1,12 @@
+config VIDEO_MX2
+	tristate "i.MX27 Camera Sensor Interface driver"
+	depends on VIDEO_DEV && SOC_CAMERA
+	depends on SOC_IMX27 || COMPILE_TEST
+	depends on HAS_DMA
+	select VIDEOBUF2_DMA_CONTIG
+	---help---
+	  This is a v4l2 driver for the i.MX27 Camera Sensor Interface
+
+	  This driver is deprecated and will be removed soon unless someone
+	  will start the work to convert this driver to the vb2 framework
+	  and remove the soc-camera dependency.

drivers/staging/media/mx2/Makefile new file +3 -0

new file mode 100644
index 0000000..fc5b282
@@ -0,0 +1,3 @@
+# Makefile for i.MX27 Camera Sensor driver
+
+obj-$(CONFIG_VIDEO_MX2) += mx2_camera.o

drivers/staging/media/mx2/mx2_camera.c renamed from drivers/media/platform/soc_camera/mx2_camera.c +0 -0

similarity index 100%
rename from drivers/media/platform/soc_camera/mx2_camera.c
rename to drivers/staging/media/mx2/mx2_camera.c

Signature · 1 line

2.7.0