Commit 85f7cd3a authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Revert "media: Kconfig: better support hybrid TV devices" 



Changing from "depends on" to "select" may cause some
side-effects. This patch is not ready to be merged yet,
as it requires some adjustments.

So, let's revert it.

This reverts commit a3b91d8b.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent d29e1ef4

drivers/media/Kconfig

+14 −12
Original line number Diff line number Diff line
@@ -77,7 +77,12 @@ config MEDIA_ANALOG_TV_SUPPORT 
	help

	  Enable analog TV support.



	  Say Y when you have a board with analog TV support.

	  Say Y when you have a TV board with analog support or with a

	  hybrid analog/digital TV chipset.



	  Note: There are several DVB cards that are based on chips that

		support both analog and digital TV. Disabling this option

		will disable support for them.



config MEDIA_DIGITAL_TV_SUPPORT

	bool
@@ -86,7 +91,8 @@ config MEDIA_DIGITAL_TV_SUPPORT 
	help

	  Enable digital TV support.



	  Say Y when you have a board with digital TV support.

	  Say Y when you have a board with digital support or a board with

	  hybrid digital TV and analog TV.



config MEDIA_RADIO_SUPPORT

	bool
@@ -100,6 +106,10 @@ config MEDIA_RADIO_SUPPORT 


	  Say Y when you have a board with radio support.



	  Note: There are several TV cards that are based on chips that

		support radio reception. Disabling this option will

		disable support for them.



config MEDIA_SDR_SUPPORT

	bool

	prompt "Software defined radio" if MEDIA_SUPPORT_FILTER
@@ -155,13 +165,9 @@ endmenu # media device types 
menu "Media core support"

	visible if !MEDIA_SUPPORT_FILTER



comment "Video4Linux core enabled to support hybrid TV devices"

	depends on MEDIA_HYBRID_USB || MEDIA_HYBRID_PCI



config VIDEO_DEV

	tristate

	prompt "Video4Linux core" if !(MEDIA_HYBRID_USB || MEDIA_HYBRID_PCI)

	default MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT || MEDIA_PLATFORM_SUPPORT || MEDIA_TEST_SUPPORT || MEDIA_HYBRID_USB || MEDIA_HYBRID_PCI

	tristate "Video4Linux core"

	default MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT || MEDIA_PLATFORM_SUPPORT || MEDIA_TEST_SUPPORT

	help

	  Enables the V4L2 API, used by cameras, analog TV, video grabbers,

	  radio devices and by some input devices.
@@ -180,12 +186,8 @@ config MEDIA_CONTROLLER 
#	Only enables if one of DTV is selected

#



comment "Digital TV core enabled to support hybrid TV devices"

	depends on MEDIA_HYBRID_USB || MEDIA_HYBRID_PCI



config DVB_CORE

	tristate

	prompt "Digital TV core"  if !(MEDIA_HYBRID_USB || MEDIA_HYBRID_PCI)

	depends on MEDIA_DIGITAL_TV_SUPPORT

	depends on (I2C || I2C=n)

	select CRC32

drivers/media/pci/Kconfig

+2 −8
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



# Should match the hybrid card list below

config MEDIA_HYBRID_PCI

	bool

	depends on VIDEO_CX18 || VIDEO_CX23885 || VIDEO_CX88 || VIDEO_BT848 || VIDEO_SAA7134 || VIDEO_SAA7164

	default y



if PCI



menuconfig MEDIA_PCI_SUPPORT
@@ -31,18 +25,18 @@ if MEDIA_ANALOG_TV_SUPPORT 
source "drivers/media/pci/ivtv/Kconfig"

source "drivers/media/pci/saa7146/Kconfig"

source "drivers/media/pci/dt3155/Kconfig"

source "drivers/media/pci/cx25821/Kconfig"

source "drivers/media/pci/cobalt/Kconfig"

endif



if MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT

	comment "Media capture/analog/hybrid TV support"

source "drivers/media/pci/cx18/Kconfig"

source "drivers/media/pci/cx23885/Kconfig"

source "drivers/media/pci/cx25821/Kconfig"

source "drivers/media/pci/cx88/Kconfig"

source "drivers/media/pci/bt8xx/Kconfig"

source "drivers/media/pci/saa7134/Kconfig"

source "drivers/media/pci/saa7164/Kconfig"

source "drivers/media/pci/cobalt/Kconfig"



endif

drivers/media/pci/bt8xx/Kconfig

+3 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config VIDEO_BT848

	tristate "BT848 Video For Linux"

	depends on PCI && I2C

	depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2

	select I2C_ALGOBIT

	select VIDEOBUF_DMA_SG

	depends on RC_CORE

	depends on MEDIA_RADIO_SUPPORT

	select VIDEO_TUNER

	select VIDEO_TVEEPROM

	select VIDEO_MSP3400 if MEDIA_SUBDRV_AUTOSELECT
@@ -23,7 +24,7 @@ config VIDEO_BT848 


config DVB_BT8XX

	tristate "DVB/ATSC Support for bt878 based TV cards"

	depends on PCI && I2C && VIDEO_BT848

	depends on DVB_CORE && PCI && I2C && VIDEO_BT848

	select DVB_MT352 if MEDIA_SUBDRV_AUTOSELECT

	select DVB_SP887X if MEDIA_SUBDRV_AUTOSELECT

	select DVB_NXT6000 if MEDIA_SUBDRV_AUTOSELECT

drivers/media/pci/cx18/Kconfig

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config VIDEO_CX18

	tristate "Conexant cx23418 MPEG encoder support"

	depends on PCI && I2C

	depends on VIDEO_V4L2 && DVB_CORE && PCI && I2C

	select I2C_ALGOBIT

	select VIDEOBUF_VMALLOC

	depends on RC_CORE

drivers/media/pci/cx23885/Kconfig

+2 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config VIDEO_CX23885

	tristate "Conexant cx23885 (2388x successor) support"

	depends on PCI && I2C && INPUT && SND

	depends on DVB_CORE && VIDEO_DEV && PCI && I2C && INPUT && SND

	select SND_PCM

	select I2C_ALGOBIT

	select VIDEO_TUNER
@@ -53,7 +53,7 @@ config VIDEO_CX23885 


config MEDIA_ALTERA_CI

	tristate "Altera FPGA based CI module"

	depends on VIDEO_CX23885

	depends on VIDEO_CX23885 && DVB_CORE

	select ALTERA_STAPL

	help

	  An Altera FPGA CI module for NetUP Dual DVB-T/C RF CI card.