media: av7110: move to staging/media/deprecated/saa7146
The av7110 driver depends on saa7146, so move it there. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Hans Verkuil
Mauro Carvalho Chehab
parent
e33fdb5a02
commit
3e9ad662e3
|
|
@ -22,8 +22,6 @@ 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/hantro/Kconfig"
|
||||
|
||||
source "drivers/staging/media/imx/Kconfig"
|
||||
|
|
|
|||
|
|
@ -15,6 +15,5 @@ obj-$(CONFIG_VIDEO_IPU3_IMGU) += ipu3/
|
|||
obj-$(CONFIG_VIDEO_TM6000) += deprecated/tm6000/
|
||||
obj-$(CONFIG_VIDEO_VIU) += deprecated/fsl-viu/
|
||||
obj-$(CONFIG_USB_ZR364XX) += deprecated/zr364xx/
|
||||
obj-$(CONFIG_DVB_AV7110) += av7110/
|
||||
obj-y += deprecated/vpfe_capture/
|
||||
obj-y += deprecated/saa7146/
|
||||
|
|
|
|||
|
|
@ -1,3 +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.
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
# 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/ saa7146/ ttpci/
|
||||
obj-y += common/ av7110/ saa7146/ ttpci/
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ config DVB_AV7110_IR
|
|||
default DVB_AV7110
|
||||
|
||||
config DVB_AV7110
|
||||
tristate "AV7110 cards"
|
||||
tristate "AV7110 cards (DEPRECATED)"
|
||||
depends on DVB_CORE && PCI && I2C
|
||||
select TTPCI_EEPROM
|
||||
select VIDEO_SAA7146_VV
|
||||
|
|
@ -35,10 +35,13 @@ 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"
|
||||
bool "AV7110 OSD support (DEPRECATED)"
|
||||
depends on DVB_AV7110
|
||||
default y if DVB_AV7110=y || DVB_AV7110=m
|
||||
help
|
||||
|
|
@ -49,10 +52,13 @@ 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"
|
||||
tristate "AV7110 cards with Budget Patch (DEPRECATED)"
|
||||
depends on DVB_BUDGET_CORE && I2C
|
||||
depends on DVB_AV7110
|
||||
select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT
|
||||
|
|
@ -68,6 +74,9 @@ 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
|
||||
|
|
@ -80,7 +89,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"
|
||||
tristate "Spase sp8870 based (DEPRECATED)"
|
||||
depends on DVB_CORE && I2C
|
||||
default m if !MEDIA_SUBDRV_AUTOSELECT
|
||||
help
|
||||
|
|
@ -91,4 +100,7 @@ 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
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
- 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 New Issue