[media] Kconfig: merge all customise options into just one

Instead of having 3 options to allow customizing the media
sub-drivers (tuners, I2C drivers, frontends), merge all of
them into just one.

That simplifies the life for users, as they can just keep
this untouched.

Life for developers is also simpler, as there's now just
one Kconfig item to remember, for the ancillary sub-drivers
providing supports for chips that could change from one
board design to another.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 38 insertions, 50 deletions

diff --git a/drivers/media/tuners/Kconfig b/drivers/media/tuners/Kconfig
index 94c6ff7a5da3..80238b9063b0 100644
--- a/drivers/media/tuners/Kconfig
+++ b/drivers/media/tuners/Kconfig
@@ -18,43 +18,31 @@ config MEDIA_ATTACH
 
           If unsure say Y.
 
+# Analog TV tuners, auto-loaded via tuner.ko
 config MEDIA_TUNER
         tristate
         depends on (MEDIA_ANALOG_TV_SUPPORT || MEDIA_RADIO_SUPPORT) && I2C
         default y
-        select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMISE
-        select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMISE
-        select MEDIA_TUNER_XC4000 if !MEDIA_TUNER_CUSTOMISE
-        select MEDIA_TUNER_MT20XX if !MEDIA_TUNER_CUSTOMISE
-        select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMISE
-        select MEDIA_TUNER_TEA5761 if !MEDIA_TUNER_CUSTOMISE && MEDIA_RADIO_SUPPORT && EXPERIMENTAL
-        select MEDIA_TUNER_TEA5767 if !MEDIA_TUNER_CUSTOMISE && MEDIA_RADIO_SUPPORT
-        select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE
-        select MEDIA_TUNER_TDA9887 if !MEDIA_TUNER_CUSTOMISE
-        select MEDIA_TUNER_MC44S803 if !MEDIA_TUNER_CUSTOMISE
-
-config MEDIA_TUNER_CUSTOMISE
-        bool "Customize analog and hybrid tuner modules to build"
-        depends on MEDIA_TUNER
-        default y if EXPERT
-        help
-          This allows the user to deselect tuner drivers unnecessary
-          for their hardware from the build. Use this option with care
-          as deselecting tuner drivers which are in fact necessary will
-          result in V4L/DVB devices which cannot be tuned due to lack of
-          driver support
-
-          If unsure say N.
+        select MEDIA_TUNER_XC2028 if MEDIA_SUBDRV_AUTOSELECT
+        select MEDIA_TUNER_XC5000 if MEDIA_SUBDRV_AUTOSELECT
+        select MEDIA_TUNER_XC4000 if MEDIA_SUBDRV_AUTOSELECT
+        select MEDIA_TUNER_MT20XX if MEDIA_SUBDRV_AUTOSELECT
+        select MEDIA_TUNER_TDA8290 if MEDIA_SUBDRV_AUTOSELECT
+        select MEDIA_TUNER_TEA5761 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_RADIO_SUPPORT && EXPERIMENTAL
+        select MEDIA_TUNER_TEA5767 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_RADIO_SUPPORT
+        select MEDIA_TUNER_SIMPLE if MEDIA_SUBDRV_AUTOSELECT
+        select MEDIA_TUNER_TDA9887 if MEDIA_SUBDRV_AUTOSELECT
+        select MEDIA_TUNER_MC44S803 if MEDIA_SUBDRV_AUTOSELECT
 
 menu "Customize TV tuners"
-        visible if MEDIA_TUNER_CUSTOMISE
+        visible if !MEDIA_SUBDRV_AUTOSELECT
         depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT
 
 config MEDIA_TUNER_SIMPLE
         tristate "Simple tuner support"
         depends on MEDIA_SUPPORT && I2C
         select MEDIA_TUNER_TDA9887
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           Say Y here to include support for various simple tuners.
 
@@ -63,28 +51,28 @@ config MEDIA_TUNER_TDA8290
         depends on MEDIA_SUPPORT && I2C
         select MEDIA_TUNER_TDA827X
         select MEDIA_TUNER_TDA18271
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           Say Y here to include support for Philips TDA8290+8275(a) tuner.
 
 config MEDIA_TUNER_TDA827X
         tristate "Philips TDA827X silicon tuner"
         depends on MEDIA_SUPPORT && I2C
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           A DVB-T silicon tuner module. Say Y when you want to support this tuner.
 
 config MEDIA_TUNER_TDA18271
         tristate "NXP TDA18271 silicon tuner"
         depends on MEDIA_SUPPORT && I2C
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           A silicon tuner module. Say Y when you want to support this tuner.
 
 config MEDIA_TUNER_TDA9887
         tristate "TDA 9885/6/7 analog IF demodulator"
         depends on MEDIA_SUPPORT && I2C
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           Say Y here to include support for Philips TDA9885/6/7
           analog IF demodulator.
@@ -93,70 +81,70 @@ config MEDIA_TUNER_TEA5761
         tristate "TEA 5761 radio tuner (EXPERIMENTAL)"
         depends on MEDIA_SUPPORT && I2C
         depends on EXPERIMENTAL
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           Say Y here to include support for the Philips TEA5761 radio tuner.
 
 config MEDIA_TUNER_TEA5767
         tristate "TEA 5767 radio tuner"
         depends on MEDIA_SUPPORT && I2C
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           Say Y here to include support for the Philips TEA5767 radio tuner.
 
 config MEDIA_TUNER_MT20XX
         tristate "Microtune 2032 / 2050 tuners"
         depends on MEDIA_SUPPORT && I2C
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           Say Y here to include support for the MT2032 / MT2050 tuner.
 
 config MEDIA_TUNER_MT2060
         tristate "Microtune MT2060 silicon IF tuner"
         depends on MEDIA_SUPPORT && I2C
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           A driver for the silicon IF tuner MT2060 from Microtune.
 
 config MEDIA_TUNER_MT2063
         tristate "Microtune MT2063 silicon IF tuner"
         depends on MEDIA_SUPPORT && I2C
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           A driver for the silicon IF tuner MT2063 from Microtune.
 
 config MEDIA_TUNER_MT2266
         tristate "Microtune MT2266 silicon tuner"
         depends on MEDIA_SUPPORT && I2C
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           A driver for the silicon baseband tuner MT2266 from Microtune.
 
 config MEDIA_TUNER_MT2131
         tristate "Microtune MT2131 silicon tuner"
         depends on MEDIA_SUPPORT && I2C
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           A driver for the silicon baseband tuner MT2131 from Microtune.
 
 config MEDIA_TUNER_QT1010
         tristate "Quantek QT1010 silicon tuner"
         depends on MEDIA_SUPPORT && I2C
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           A driver for the silicon tuner QT1010 from Quantek.
 
 config MEDIA_TUNER_XC2028
         tristate "XCeive xc2028/xc3028 tuners"
         depends on MEDIA_SUPPORT && I2C
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           Say Y here to include support for the xc2028/xc3028 tuners.
 
 config MEDIA_TUNER_XC5000
         tristate "Xceive XC5000 silicon tuner"
         depends on MEDIA_SUPPORT && I2C
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           A driver for the silicon tuner XC5000 from Xceive.
           This device is only used inside a SiP called together with a
@@ -165,7 +153,7 @@ config MEDIA_TUNER_XC5000
 config MEDIA_TUNER_XC4000
         tristate "Xceive XC4000 silicon tuner"
         depends on MEDIA_SUPPORT && I2C
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           A driver for the silicon tuner XC4000 from Xceive.
           This device is only used inside a SiP called together with a
@@ -174,70 +162,70 @@ config MEDIA_TUNER_XC4000
 config MEDIA_TUNER_MXL5005S
         tristate "MaxLinear MSL5005S silicon tuner"
         depends on MEDIA_SUPPORT && I2C
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           A driver for the silicon tuner MXL5005S from MaxLinear.
 
 config MEDIA_TUNER_MXL5007T
         tristate "MaxLinear MxL5007T silicon tuner"
         depends on MEDIA_SUPPORT && I2C
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           A driver for the silicon tuner MxL5007T from MaxLinear.
 
 config MEDIA_TUNER_MC44S803
         tristate "Freescale MC44S803 Low Power CMOS Broadband tuners"
         depends on MEDIA_SUPPORT && I2C
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           Say Y here to support the Freescale MC44S803 based tuners
 
 config MEDIA_TUNER_MAX2165
         tristate "Maxim MAX2165 silicon tuner"
         depends on MEDIA_SUPPORT && I2C
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           A driver for the silicon tuner MAX2165 from Maxim.
 
 config MEDIA_TUNER_TDA18218
         tristate "NXP TDA18218 silicon tuner"
         depends on MEDIA_SUPPORT && I2C
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           NXP TDA18218 silicon tuner driver.
 
 config MEDIA_TUNER_FC0011
         tristate "Fitipower FC0011 silicon tuner"
         depends on MEDIA_SUPPORT && I2C
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           Fitipower FC0011 silicon tuner driver.
 
 config MEDIA_TUNER_FC0012
         tristate "Fitipower FC0012 silicon tuner"
         depends on MEDIA_SUPPORT && I2C
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           Fitipower FC0012 silicon tuner driver.
 
 config MEDIA_TUNER_FC0013
         tristate "Fitipower FC0013 silicon tuner"
         depends on MEDIA_SUPPORT && I2C
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           Fitipower FC0013 silicon tuner driver.
 
 config MEDIA_TUNER_TDA18212
         tristate "NXP TDA18212 silicon tuner"
         depends on MEDIA_SUPPORT && I2C
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           NXP TDA18212 silicon tuner driver.
 
 config MEDIA_TUNER_TUA9001
         tristate "Infineon TUA 9001 silicon tuner"
         depends on MEDIA_SUPPORT && I2C
-        default m if MEDIA_TUNER_CUSTOMISE
+        default m if !MEDIA_SUBDRV_AUTOSELECT
         help
           Infineon TUA 9001 silicon tuner driver.
 endmenu