mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 22:26:55 +00:00
media: Revert "media: av7110: move to staging/media/deprecated/saa7146"
This reverts commit 3e9ad662e3
.
The av7110 is still in use, so it can't be deprecated. Move it back
to staging/media for now.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
parent
4e5bd3fdbe
commit
0fcb867718
74 changed files with 11 additions and 27 deletions
|
@ -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"
|
||||
|
|
|
@ -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/
|
||||
|
|
|
@ -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
|
3
drivers/staging/media/av7110/TODO
Normal file
3
drivers/staging/media/av7110/TODO
Normal file
|
@ -0,0 +1,3 @@
|
|||
- 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.
|
|
@ -1,5 +1,4 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
source "drivers/staging/media/deprecated/saa7146/common/Kconfig"
|
||||
source "drivers/staging/media/deprecated/saa7146/av7110/Kconfig"
|
||||
source "drivers/staging/media/deprecated/saa7146/saa7146/Kconfig"
|
||||
source "drivers/staging/media/deprecated/saa7146/ttpci/Kconfig"
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
obj-y += common/ av7110/ saa7146/ ttpci/
|
||||
obj-y += common/ saa7146/ ttpci/
|
||||
|
|
|
@ -1,9 +0,0 @@
|
|||
- 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).
|
Loading…
Reference in a new issue