Browse Source

media: zoran: move to staging in preparation for removal

This driver hasn't been tested in a long, long time. The hardware is
ancient and pretty much obsolete. This driver also needs to be converted
to newer media frameworks (vb2!) but due to the lack of time and interest
that is unlikely to happen.

So this driver is a prime candidate for removal. If someone is interested
in working on this driver to prevent its removal, then please contact the
linux-media mailinglist.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Hans Verkuil 7 years ago
parent
commit
68afa17322

+ 1 - 1
MAINTAINERS

@@ -15609,7 +15609,7 @@ L:	linux-media@vger.kernel.org
 W:	http://mjpeg.sourceforge.net/driver-zoran/
 T:	hg https://linuxtv.org/hg/v4l-dvb
 S:	Odd Fixes
-F:	drivers/media/pci/zoran/
+F:	drivers/staging/media/zoran/
 
 ZRAM COMPRESSED RAM BLOCK DEVICE DRVIER
 M:	Minchan Kim <minchan@kernel.org>

+ 0 - 1
drivers/media/pci/Kconfig

@@ -16,7 +16,6 @@ source "drivers/media/pci/sta2x11/Kconfig"
 source "drivers/media/pci/tw5864/Kconfig"
 source "drivers/media/pci/tw68/Kconfig"
 source "drivers/media/pci/tw686x/Kconfig"
-source "drivers/media/pci/zoran/Kconfig"
 endif
 
 if MEDIA_ANALOG_TV_SUPPORT

+ 0 - 1
drivers/media/pci/Makefile

@@ -18,7 +18,6 @@ obj-y        +=	ttpci/		\
 		intel/
 
 obj-$(CONFIG_VIDEO_IVTV) += ivtv/
-obj-$(CONFIG_VIDEO_ZORAN) += zoran/
 obj-$(CONFIG_VIDEO_CX18) += cx18/
 obj-$(CONFIG_VIDEO_CX23885) += cx23885/
 obj-$(CONFIG_VIDEO_CX25821) += cx25821/

+ 2 - 0
drivers/staging/media/Kconfig

@@ -33,4 +33,6 @@ source "drivers/staging/media/omap4iss/Kconfig"
 
 source "drivers/staging/media/tegra-vde/Kconfig"
 
+source "drivers/staging/media/zoran/Kconfig"
+
 endif

+ 1 - 0
drivers/staging/media/Makefile

@@ -6,3 +6,4 @@ obj-$(CONFIG_SOC_CAMERA_MT9T031)	+= mt9t031/
 obj-$(CONFIG_VIDEO_DM365_VPFE)	+= davinci_vpfe/
 obj-$(CONFIG_VIDEO_OMAP4)	+= omap4iss/
 obj-$(CONFIG_TEGRA_VDE)		+= tegra-vde/
+obj-$(CONFIG_VIDEO_ZORAN)	+= zoran/

+ 1 - 1
drivers/media/pci/zoran/Kconfig → drivers/staging/media/zoran/Kconfig

@@ -1,5 +1,5 @@
 config VIDEO_ZORAN
-	tristate "Zoran ZR36057/36067 Video For Linux"
+	tristate "Zoran ZR36057/36067 Video For Linux (Deprecated)"
 	depends on PCI && I2C_ALGOBIT && VIDEO_V4L2 && VIRT_TO_BUS
 	depends on !ALPHA
 	help

+ 0 - 0
drivers/media/pci/zoran/Makefile → drivers/staging/media/zoran/Makefile


+ 4 - 0
drivers/staging/media/zoran/TODO

@@ -0,0 +1,4 @@
+The zoran driver is marked deprecated. It will be removed
+around May 2019 unless someone is willing to update this
+driver to the latest V4L2 frameworks (especially the vb2
+framework).

+ 0 - 0
drivers/media/pci/zoran/videocodec.c → drivers/staging/media/zoran/videocodec.c


+ 0 - 0
drivers/media/pci/zoran/videocodec.h → drivers/staging/media/zoran/videocodec.h


+ 0 - 0
drivers/media/pci/zoran/zoran.h → drivers/staging/media/zoran/zoran.h


+ 0 - 0
drivers/media/pci/zoran/zoran_card.c → drivers/staging/media/zoran/zoran_card.c


+ 0 - 0
drivers/media/pci/zoran/zoran_card.h → drivers/staging/media/zoran/zoran_card.h


+ 0 - 0
drivers/media/pci/zoran/zoran_device.c → drivers/staging/media/zoran/zoran_device.c


+ 0 - 0
drivers/media/pci/zoran/zoran_device.h → drivers/staging/media/zoran/zoran_device.h


+ 0 - 0
drivers/media/pci/zoran/zoran_driver.c → drivers/staging/media/zoran/zoran_driver.c


+ 0 - 0
drivers/media/pci/zoran/zoran_procfs.c → drivers/staging/media/zoran/zoran_procfs.c


+ 0 - 0
drivers/media/pci/zoran/zoran_procfs.h → drivers/staging/media/zoran/zoran_procfs.h


+ 0 - 0
drivers/media/pci/zoran/zr36016.c → drivers/staging/media/zoran/zr36016.c


+ 0 - 0
drivers/media/pci/zoran/zr36016.h → drivers/staging/media/zoran/zr36016.h


+ 0 - 0
drivers/media/pci/zoran/zr36050.c → drivers/staging/media/zoran/zr36050.c


+ 0 - 0
drivers/media/pci/zoran/zr36050.h → drivers/staging/media/zoran/zr36050.h


+ 0 - 0
drivers/media/pci/zoran/zr36057.h → drivers/staging/media/zoran/zr36057.h


+ 0 - 0
drivers/media/pci/zoran/zr36060.c → drivers/staging/media/zoran/zr36060.c


+ 0 - 0
drivers/media/pci/zoran/zr36060.h → drivers/staging/media/zoran/zr36060.h