瀏覽代碼

V4L/DVB (4608b): i2c deps fix on DVB

Several DVB modules depends on I2C

Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey 18 年之前
父節點
當前提交
c482d4f6e8

+ 1 - 0
drivers/media/dvb/b2c2/Kconfig

@@ -1,6 +1,7 @@
 config DVB_B2C2_FLEXCOP
 config DVB_B2C2_FLEXCOP
 	tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"
 	tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"
 	depends on DVB_CORE && I2C
 	depends on DVB_CORE && I2C
+	select DVB_PLL
 	select DVB_STV0299
 	select DVB_STV0299
 	select DVB_MT352
 	select DVB_MT352
 	select DVB_MT312
 	select DVB_MT312

+ 1 - 0
drivers/media/dvb/bt8xx/Kconfig

@@ -1,6 +1,7 @@
 config DVB_BT8XX
 config DVB_BT8XX
 	tristate "BT8xx based PCI cards"
 	tristate "BT8xx based PCI cards"
 	depends on DVB_CORE && PCI && I2C && VIDEO_BT848
 	depends on DVB_CORE && PCI && I2C && VIDEO_BT848
+	select DVB_PLL
 	select DVB_MT352
 	select DVB_MT352
 	select DVB_SP887X
 	select DVB_SP887X
 	select DVB_NXT6000
 	select DVB_NXT6000

+ 1 - 0
drivers/media/dvb/dvb-usb/Kconfig

@@ -2,6 +2,7 @@ config DVB_USB
 	tristate "Support for various USB DVB devices"
 	tristate "Support for various USB DVB devices"
 	depends on DVB_CORE && USB && I2C
 	depends on DVB_CORE && USB && I2C
 	select FW_LOADER
 	select FW_LOADER
+	select DVB_PLL
 	help
 	help
 	  By enabling this you will be able to choose the various supported
 	  By enabling this you will be able to choose the various supported
 	  USB1.1 and USB2.0 DVB devices.
 	  USB1.1 and USB2.0 DVB devices.

+ 32 - 28
drivers/media/dvb/frontends/Kconfig

@@ -6,43 +6,43 @@ comment "DVB-S (satellite) frontends"
 
 
 config DVB_STV0299
 config DVB_STV0299
 	tristate "ST STV0299 based"
 	tristate "ST STV0299 based"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	help
 	help
 	  A DVB-S tuner module. Say Y when you want to support this frontend.
 	  A DVB-S tuner module. Say Y when you want to support this frontend.
 
 
 config DVB_CX24110
 config DVB_CX24110
 	tristate "Conexant CX24110 based"
 	tristate "Conexant CX24110 based"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	help
 	help
 	  A DVB-S tuner module. Say Y when you want to support this frontend.
 	  A DVB-S tuner module. Say Y when you want to support this frontend.
 
 
 config DVB_CX24123
 config DVB_CX24123
 	tristate "Conexant CX24123 based"
 	tristate "Conexant CX24123 based"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	help
 	help
 	  A DVB-S tuner module. Say Y when you want to support this frontend.
 	  A DVB-S tuner module. Say Y when you want to support this frontend.
 
 
 config DVB_TDA8083
 config DVB_TDA8083
 	tristate "Philips TDA8083 based"
 	tristate "Philips TDA8083 based"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	help
 	help
 	  A DVB-S tuner module. Say Y when you want to support this frontend.
 	  A DVB-S tuner module. Say Y when you want to support this frontend.
 
 
 config DVB_MT312
 config DVB_MT312
 	tristate "Zarlink VP310/MT312 based"
 	tristate "Zarlink VP310/MT312 based"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	help
 	help
 	  A DVB-S tuner module. Say Y when you want to support this frontend.
 	  A DVB-S tuner module. Say Y when you want to support this frontend.
 
 
 config DVB_VES1X93
 config DVB_VES1X93
 	tristate "VLSI VES1893 or VES1993 based"
 	tristate "VLSI VES1893 or VES1993 based"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	help
 	help
 	  A DVB-S tuner module. Say Y when you want to support this frontend.
 	  A DVB-S tuner module. Say Y when you want to support this frontend.
 
 
 config DVB_S5H1420
 config DVB_S5H1420
 	tristate "Samsung S5H1420 based"
 	tristate "Samsung S5H1420 based"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	help
 	help
 	  A DVB-S tuner module. Say Y when you want to support this frontend.
 	  A DVB-S tuner module. Say Y when you want to support this frontend.
 
 
@@ -51,7 +51,7 @@ comment "DVB-T (terrestrial) frontends"
 
 
 config DVB_SP8870
 config DVB_SP8870
 	tristate "Spase sp8870 based"
 	tristate "Spase sp8870 based"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	select FW_LOADER
 	select FW_LOADER
 	help
 	help
 	  A DVB-T tuner module. Say Y when you want to support this frontend.
 	  A DVB-T tuner module. Say Y when you want to support this frontend.
@@ -63,7 +63,7 @@ config DVB_SP8870
 
 
 config DVB_SP887X
 config DVB_SP887X
 	tristate "Spase sp887x based"
 	tristate "Spase sp887x based"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	select FW_LOADER
 	select FW_LOADER
 	help
 	help
 	  A DVB-T tuner module. Say Y when you want to support this frontend.
 	  A DVB-T tuner module. Say Y when you want to support this frontend.
@@ -75,25 +75,25 @@ config DVB_SP887X
 
 
 config DVB_CX22700
 config DVB_CX22700
 	tristate "Conexant CX22700 based"
 	tristate "Conexant CX22700 based"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	help
 	help
 	  A DVB-T tuner module. Say Y when you want to support this frontend.
 	  A DVB-T tuner module. Say Y when you want to support this frontend.
 
 
 config DVB_CX22702
 config DVB_CX22702
 	tristate "Conexant cx22702 demodulator (OFDM)"
 	tristate "Conexant cx22702 demodulator (OFDM)"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	help
 	help
 	  A DVB-T tuner module. Say Y when you want to support this frontend.
 	  A DVB-T tuner module. Say Y when you want to support this frontend.
 
 
 config DVB_L64781
 config DVB_L64781
 	tristate "LSI L64781"
 	tristate "LSI L64781"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	help
 	help
 	  A DVB-T tuner module. Say Y when you want to support this frontend.
 	  A DVB-T tuner module. Say Y when you want to support this frontend.
 
 
 config DVB_TDA1004X
 config DVB_TDA1004X
 	tristate "Philips TDA10045H/TDA10046H based"
 	tristate "Philips TDA10045H/TDA10046H based"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	select FW_LOADER
 	select FW_LOADER
 	help
 	help
 	  A DVB-T tuner module. Say Y when you want to support this frontend.
 	  A DVB-T tuner module. Say Y when you want to support this frontend.
@@ -106,32 +106,32 @@ config DVB_TDA1004X
 
 
 config DVB_NXT6000
 config DVB_NXT6000
 	tristate "NxtWave Communications NXT6000 based"
 	tristate "NxtWave Communications NXT6000 based"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	help
 	help
 	  A DVB-T tuner module. Say Y when you want to support this frontend.
 	  A DVB-T tuner module. Say Y when you want to support this frontend.
 
 
 config DVB_MT352
 config DVB_MT352
 	tristate "Zarlink MT352 based"
 	tristate "Zarlink MT352 based"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	help
 	help
 	  A DVB-T tuner module. Say Y when you want to support this frontend.
 	  A DVB-T tuner module. Say Y when you want to support this frontend.
 
 
 config DVB_ZL10353
 config DVB_ZL10353
 	tristate "Zarlink ZL10353 based"
 	tristate "Zarlink ZL10353 based"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	help
 	help
 	  A DVB-T tuner module. Say Y when you want to support this frontend.
 	  A DVB-T tuner module. Say Y when you want to support this frontend.
 
 
 config DVB_DIB3000MB
 config DVB_DIB3000MB
 	tristate "DiBcom 3000M-B"
 	tristate "DiBcom 3000M-B"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	help
 	help
 	  A DVB-T tuner module. Designed for mobile usage. Say Y when you want
 	  A DVB-T tuner module. Designed for mobile usage. Say Y when you want
 	  to support this frontend.
 	  to support this frontend.
 
 
 config DVB_DIB3000MC
 config DVB_DIB3000MC
 	tristate "DiBcom 3000P/M-C"
 	tristate "DiBcom 3000P/M-C"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	help
 	help
 	  A DVB-T tuner module. Designed for mobile usage. Say Y when you want
 	  A DVB-T tuner module. Designed for mobile usage. Say Y when you want
 	  to support this frontend.
 	  to support this frontend.
@@ -141,19 +141,19 @@ comment "DVB-C (cable) frontends"
 
 
 config DVB_VES1820
 config DVB_VES1820
 	tristate "VLSI VES1820 based"
 	tristate "VLSI VES1820 based"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	help
 	help
 	  A DVB-C tuner module. Say Y when you want to support this frontend.
 	  A DVB-C tuner module. Say Y when you want to support this frontend.
 
 
 config DVB_TDA10021
 config DVB_TDA10021
 	tristate "Philips TDA10021 based"
 	tristate "Philips TDA10021 based"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	help
 	help
 	  A DVB-C tuner module. Say Y when you want to support this frontend.
 	  A DVB-C tuner module. Say Y when you want to support this frontend.
 
 
 config DVB_STV0297
 config DVB_STV0297
 	tristate "ST STV0297 based"
 	tristate "ST STV0297 based"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	help
 	help
 	  A DVB-C tuner module. Say Y when you want to support this frontend.
 	  A DVB-C tuner module. Say Y when you want to support this frontend.
 
 
@@ -162,7 +162,7 @@ comment "ATSC (North American/Korean Terrestrial/Cable DTV) frontends"
 
 
 config DVB_NXT200X
 config DVB_NXT200X
 	tristate "NxtWave Communications NXT2002/NXT2004 based"
 	tristate "NxtWave Communications NXT2002/NXT2004 based"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	select FW_LOADER
 	select FW_LOADER
 	help
 	help
 	  An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
 	  An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
@@ -176,7 +176,7 @@ config DVB_NXT200X
 
 
 config DVB_OR51211
 config DVB_OR51211
 	tristate "Oren OR51211 based"
 	tristate "Oren OR51211 based"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	select FW_LOADER
 	select FW_LOADER
 	help
 	help
 	  An ATSC 8VSB tuner module. Say Y when you want to support this frontend.
 	  An ATSC 8VSB tuner module. Say Y when you want to support this frontend.
@@ -188,7 +188,7 @@ config DVB_OR51211
 
 
 config DVB_OR51132
 config DVB_OR51132
 	tristate "Oren OR51132 based"
 	tristate "Oren OR51132 based"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	select FW_LOADER
 	select FW_LOADER
 	help
 	help
 	  An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
 	  An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
@@ -203,7 +203,7 @@ config DVB_OR51132
 
 
 config DVB_BCM3510
 config DVB_BCM3510
 	tristate "Broadcom BCM3510"
 	tristate "Broadcom BCM3510"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	select FW_LOADER
 	select FW_LOADER
 	help
 	help
 	  An ATSC 8VSB/16VSB and QAM64/256 tuner module. Say Y when you want to
 	  An ATSC 8VSB/16VSB and QAM64/256 tuner module. Say Y when you want to
@@ -211,7 +211,7 @@ config DVB_BCM3510
 
 
 config DVB_LGDT330X
 config DVB_LGDT330X
 	tristate "LG Electronics LGDT3302/LGDT3303 based"
 	tristate "LG Electronics LGDT3302/LGDT3303 based"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	help
 	help
 	  An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
 	  An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
 	  to support this frontend.
 	  to support this frontend.
@@ -220,15 +220,19 @@ config DVB_LGDT330X
 comment "Miscellaneous devices"
 comment "Miscellaneous devices"
 	depends on DVB_CORE
 	depends on DVB_CORE
 
 
+config DVB_PLL
+	tristate
+	depends on DVB_CORE && I2C
+
 config DVB_LNBP21
 config DVB_LNBP21
 	tristate "LNBP21 SEC controller"
 	tristate "LNBP21 SEC controller"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	help
 	help
 	  An SEC control chip.
 	  An SEC control chip.
 
 
 config DVB_ISL6421
 config DVB_ISL6421
 	tristate "ISL6421 SEC controller"
 	tristate "ISL6421 SEC controller"
-	depends on DVB_CORE
+	depends on DVB_CORE && I2C
 	help
 	help
 	  An SEC control chip.
 	  An SEC control chip.
 
 

+ 1 - 1
drivers/media/dvb/frontends/Makefile

@@ -4,7 +4,7 @@
 
 
 EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/
 EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/
 
 
-obj-$(CONFIG_DVB_CORE) += dvb-pll.o
+obj-$(CONFIG_DVB_PLL) += dvb-pll.o
 obj-$(CONFIG_DVB_STV0299) += stv0299.o
 obj-$(CONFIG_DVB_STV0299) += stv0299.o
 obj-$(CONFIG_DVB_SP8870) += sp8870.o
 obj-$(CONFIG_DVB_SP8870) += sp8870.o
 obj-$(CONFIG_DVB_CX22700) += cx22700.o
 obj-$(CONFIG_DVB_CX22700) += cx22700.o

+ 1 - 0
drivers/media/dvb/pluto2/Kconfig

@@ -2,6 +2,7 @@ config DVB_PLUTO2
 	tristate "Pluto2 cards"
 	tristate "Pluto2 cards"
 	depends on DVB_CORE && PCI && I2C
 	depends on DVB_CORE && PCI && I2C
 	select I2C_ALGOBIT
 	select I2C_ALGOBIT
+	select DVB_PLL
 	select DVB_TDA1004X
 	select DVB_TDA1004X
 	help
 	help
 	  Support for PCI cards based on the Pluto2 FPGA like the Satelco
 	  Support for PCI cards based on the Pluto2 FPGA like the Satelco

+ 5 - 0
drivers/media/dvb/ttpci/Kconfig

@@ -3,6 +3,7 @@ config DVB_AV7110
 	depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
 	depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
 	select FW_LOADER
 	select FW_LOADER
 	select VIDEO_SAA7146_VV
 	select VIDEO_SAA7146_VV
+	select DVB_PLL
 	select DVB_VES1820
 	select DVB_VES1820
 	select DVB_VES1X93
 	select DVB_VES1X93
 	select DVB_STV0299
 	select DVB_STV0299
@@ -61,6 +62,7 @@ config DVB_BUDGET
 	tristate "Budget cards"
 	tristate "Budget cards"
 	depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
 	depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
 	select VIDEO_SAA7146
 	select VIDEO_SAA7146
+	select DVB_PLL
 	select DVB_STV0299
 	select DVB_STV0299
 	select DVB_VES1X93
 	select DVB_VES1X93
 	select DVB_VES1820
 	select DVB_VES1820
@@ -83,6 +85,7 @@ config DVB_BUDGET_CI
 	tristate "Budget cards with onboard CI connector"
 	tristate "Budget cards with onboard CI connector"
 	depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
 	depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
 	select VIDEO_SAA7146
 	select VIDEO_SAA7146
+	select DVB_PLL
 	select DVB_STV0297
 	select DVB_STV0297
 	select DVB_STV0299
 	select DVB_STV0299
 	select DVB_TDA1004X
 	select DVB_TDA1004X
@@ -104,6 +107,7 @@ config DVB_BUDGET_AV
 	tristate "Budget cards with analog video inputs"
 	tristate "Budget cards with analog video inputs"
 	depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
 	depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
 	select VIDEO_SAA7146_VV
 	select VIDEO_SAA7146_VV
+	select DVB_PLL
 	select DVB_STV0299
 	select DVB_STV0299
 	select DVB_TDA1004X
 	select DVB_TDA1004X
 	select DVB_TDA10021
 	select DVB_TDA10021
@@ -122,6 +126,7 @@ config DVB_BUDGET_PATCH
 	tristate "AV7110 cards with Budget Patch"
 	tristate "AV7110 cards with Budget Patch"
 	depends on DVB_CORE && DVB_BUDGET && VIDEO_V4L1
 	depends on DVB_CORE && DVB_BUDGET && VIDEO_V4L1
 	select DVB_AV7110
 	select DVB_AV7110
+	select DVB_PLL
 	select DVB_STV0299
 	select DVB_STV0299
 	select DVB_VES1X93
 	select DVB_VES1X93
 	select DVB_TDA8083
 	select DVB_TDA8083

+ 2 - 1
drivers/media/dvb/ttusb-budget/Kconfig

@@ -1,6 +1,7 @@
 config DVB_TTUSB_BUDGET
 config DVB_TTUSB_BUDGET
 	tristate "Technotrend/Hauppauge Nova-USB devices"
 	tristate "Technotrend/Hauppauge Nova-USB devices"
-	depends on DVB_CORE && USB
+	depends on DVB_CORE && USB && I2C
+	select DVB_PLL
 	select DVB_CX22700
 	select DVB_CX22700
 	select DVB_TDA1004X
 	select DVB_TDA1004X
 	select DVB_VES1820
 	select DVB_VES1820

+ 1 - 0
drivers/media/video/cx88/Kconfig

@@ -51,6 +51,7 @@ config VIDEO_CX88_DVB
 	tristate "DVB/ATSC Support for cx2388x based TV cards"
 	tristate "DVB/ATSC Support for cx2388x based TV cards"
 	depends on VIDEO_CX88 && DVB_CORE
 	depends on VIDEO_CX88 && DVB_CORE
 	select VIDEO_BUF_DVB
 	select VIDEO_BUF_DVB
+	select DVB_PLL
 	---help---
 	---help---
 	  This adds support for DVB/ATSC cards based on the
 	  This adds support for DVB/ATSC cards based on the
 	  Conexant 2388x chip.
 	  Conexant 2388x chip.

+ 1 - 0
drivers/media/video/saa7134/Kconfig

@@ -40,6 +40,7 @@ config VIDEO_SAA7134_DVB
 	depends on VIDEO_SAA7134 && DVB_CORE
 	depends on VIDEO_SAA7134 && DVB_CORE
 	select VIDEO_BUF_DVB
 	select VIDEO_BUF_DVB
 	select FW_LOADER
 	select FW_LOADER
+	select DVB_PLL
 	---help---
 	---help---
 	  This adds support for DVB cards based on the
 	  This adds support for DVB cards based on the
 	  Philips saa7134 chip.
 	  Philips saa7134 chip.