Commit 0fcb8677 authored by Hans Verkuil's avatar Hans Verkuil
Browse files

media: Revert "media: av7110: move to staging/media/deprecated/saa7146" 



This reverts commit 3e9ad662.

The av7110 is still in use, so it can't be deprecated. Move it back
to staging/media for now.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 4e5bd3fd

drivers/staging/media/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ if STAGING_MEDIA && MEDIA_SUPPORT 
# Please keep them in alphabetic order

source "drivers/staging/media/atomisp/Kconfig"



source "drivers/staging/media/av7110/Kconfig"



source "drivers/staging/media/imx/Kconfig"



source "drivers/staging/media/ipu3/Kconfig"

drivers/staging/media/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -9,4 +9,5 @@ obj-$(CONFIG_VIDEO_ROCKCHIP_VDEC) += rkvdec/ 
obj-$(CONFIG_VIDEO_SUNXI)	+= sunxi/

obj-$(CONFIG_VIDEO_TEGRA)	+= tegra-video/

obj-$(CONFIG_VIDEO_IPU3_IMGU)	+= ipu3/

obj-$(CONFIG_DVB_AV7110)	+= av7110/

obj-y += deprecated/saa7146/

drivers/staging/media/deprecated/saa7146/av7110/Kconfig→drivers/staging/media/av7110/Kconfig

+4 −16
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ config DVB_AV7110_IR 
	default DVB_AV7110



config DVB_AV7110

	tristate "AV7110 cards (DEPRECATED)"

	tristate "AV7110 cards"

	depends on DVB_CORE && PCI && I2C

	select TTPCI_EEPROM

	select VIDEO_SAA7146_VV
@@ -35,13 +35,10 @@ config DVB_AV7110 
	  kernel image by adding the filename to the EXTRA_FIRMWARE

	  configuration option string.



	  This driver is deprecated and is scheduled for removal by

	  the beginning of 2023. See the TODO file for more information.



	  Say Y if you own such a card and want to use it.



config DVB_AV7110_OSD

	bool "AV7110 OSD support (DEPRECATED)"

	bool "AV7110 OSD support"

	depends on DVB_AV7110

	default y if DVB_AV7110=y || DVB_AV7110=m

	help
@@ -52,13 +49,10 @@ config DVB_AV7110_OSD 
	  Anyway, some popular DVB software like VDR uses this OSD to render

	  its menus, so say Y if you want to use this software.



	  This driver is deprecated and is scheduled for removal by

	  the beginning of 2023. See the TODO file for more information.



	  All other people say N.



config DVB_BUDGET_PATCH

	tristate "AV7110 cards with Budget Patch (DEPRECATED)"

	tristate "AV7110 cards with Budget Patch"

	depends on DVB_BUDGET_CORE && I2C

	depends on DVB_AV7110

	select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT
@@ -74,9 +68,6 @@ config DVB_BUDGET_PATCH 
	  standard AV7110 driver prior to loading this

	  driver.



	  This driver is deprecated and is scheduled for removal by

	  the beginning of 2023. See the TODO file for more information.



	  Say Y if you own such a card and want to use it.



	  To compile this driver as a module, choose M here: the
@@ -89,7 +80,7 @@ if DVB_AV7110 
# it if we drop support for AV7110, as no other driver will use it.



config DVB_SP8870

	tristate "Spase sp8870 based (DEPRECATED)"

	tristate "Spase sp8870 based"

	depends on DVB_CORE && I2C

	default m if !MEDIA_SUBDRV_AUTOSELECT

	help
@@ -100,7 +91,4 @@ config DVB_SP8870 
	  download/extract it, and then copy it to /usr/lib/hotplug/firmware

	  or /lib/firmware (depending on configuration of firmware hotplug).



	  This driver is deprecated and is scheduled for removal by

	  the beginning of 2023. See the TODO file for more information.



endif

drivers/staging/media/deprecated/saa7146/av7110/TODO→drivers/staging/media/av7110/TODO

+3 −0
Original line number Diff line number Diff line 
- This driver is too old and relies on a different API.

  Drop it from Kernel on a couple of versions.

- Cleanup patches for the drivers here won't be accepted.
 


These drivers are now deprecated with the intent of

removing them altogether by the beginning of 2023.



If someone is interested in doing this work, then contact the

linux-media mailinglist (https://linuxtv.org/lists.php).