Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47a9991e authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (5780): Dvb: Remove static dependencies on dvb-pll 



This patch removes all static dependencies on the dvb-pll module.
All exported dvb_pll_desc's have been UNexported, and the caller
will reference the individual dvb_pll_desc by it's index in the
pll_list array.

Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarTrent Piepho <xyzzy@speakeasy.org>
Signed-off-by: default avatarPatrick Boettcher <pb@linuxtv.org>
Acked-by: default avatarOliver Endriss <o.endriss@gmx.de>
Acked-by: default avatarManu Abraham <manu@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 6c08d929

drivers/media/dvb/b2c2/Kconfig

+1 −1
Original line number Diff line number Diff line 
config DVB_B2C2_FLEXCOP

	tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"

	depends on DVB_CORE && I2C

	select DVB_PLL

	select DVB_PLL if !DVB_FE_CUSTOMISE

	select DVB_STV0299 if !DVB_FE_CUSTOMISE

	select DVB_MT352 if !DVB_FE_CUSTOMISE

	select DVB_MT312 if !DVB_FE_CUSTOMISE

drivers/media/dvb/b2c2/flexcop-fe-tuner.c

+2 −2
Original line number Diff line number Diff line
@@ -500,13 +500,13 @@ int flexcop_frontend_init(struct flexcop_device *fc) 
	/* try the air atsc 2nd generation (nxt2002) */

	if ((fc->fe = dvb_attach(nxt200x_attach, &samsung_tbmv_config, &fc->i2c_adap)) != NULL) {

		fc->dev_type          = FC_AIR_ATSC2;

		dvb_attach(dvb_pll_attach, fc->fe, 0x61, NULL, &dvb_pll_samsung_tbmv);

		dvb_attach(dvb_pll_attach, fc->fe, 0x61, NULL, DVB_PLL_SAMSUNG_TBMV);

		info("found the nxt2002 at i2c address: 0x%02x",samsung_tbmv_config.demod_address);

	} else

	/* try the air atsc 3nd generation (lgdt3303) */

	if ((fc->fe = dvb_attach(lgdt330x_attach, &air2pc_atsc_hd5000_config, &fc->i2c_adap)) != NULL) {

		fc->dev_type          = FC_AIR_ATSC3;

		dvb_attach(dvb_pll_attach, fc->fe, 0x61, &fc->i2c_adap, &dvb_pll_lg_tdvs_h06xf);

		dvb_attach(dvb_pll_attach, fc->fe, 0x61, &fc->i2c_adap, DVB_PLL_LG_TDVS_H06XF);

		info("found the lgdt3303 at i2c address: 0x%02x",air2pc_atsc_hd5000_config.demod_address);

	} else

	/* try the air atsc 1nd generation (bcm3510)/panasonic ct10s */

drivers/media/dvb/bt8xx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ config DVB_BT8XX 
	select DVB_CX24110 if !DVB_FE_CUSTOMISE

	select DVB_OR51211 if !DVB_FE_CUSTOMISE

	select DVB_LGDT330X if !DVB_FE_CUSTOMISE

	select DVB_PLL

	select DVB_PLL if !DVB_FE_CUSTOMISE

	select DVB_ZL10353 if !DVB_FE_CUSTOMISE

	select FW_LOADER

	help

drivers/media/dvb/bt8xx/dvb-bt8xx.c

+1 −1
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type) 
		card->fe = dvb_attach(lgdt330x_attach, &tdvs_tua6034_config, card->i2c_adapter);

		if (card->fe != NULL) {

			dvb_attach(dvb_pll_attach, card->fe, 0x61,

				   card->i2c_adapter, &dvb_pll_lg_tdvs_h06xf);

				   card->i2c_adapter, DVB_PLL_LG_TDVS_H06XF);

			dprintk ("dvb_bt8xx: lgdt330x detected\n");

		}

		break;

drivers/media/dvb/dvb-usb/Kconfig

+7 −5
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ config DVB_USB 
	tristate "Support for various USB DVB devices"

	depends on DVB_CORE && USB && I2C

	select FW_LOADER

	select DVB_PLL

	help

	  By enabling this you will be able to choose the various supported

	  USB1.1 and USB2.0 DVB devices.
@@ -27,13 +26,14 @@ config DVB_USB_A800 
	depends on DVB_USB

	select DVB_DIB3000MC

	select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE

	select DVB_PLL if !DVB_FE_CUSTOMISE

	help

	  Say Y here to support the AVerMedia AverTV DVB-T USB 2.0 (A800) receiver.



config DVB_USB_DIBUSB_MB

	tristate "DiBcom USB DVB-T devices (based on the DiB3000M-B) (see help for device list)"

	depends on DVB_USB

	select DVB_PLL

	select DVB_PLL if !DVB_FE_CUSTOMISE

	select DVB_DIB3000MB

	select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE

	help
@@ -89,7 +89,7 @@ config DVB_USB_DIB0700 
config DVB_USB_UMT_010

	tristate "HanfTek UMT-010 DVB-T USB2.0 support"

	depends on DVB_USB

	select DVB_PLL

	select DVB_PLL if !DVB_FE_CUSTOMISE

	select DVB_DIB3000MC

	select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE

	help
@@ -98,7 +98,7 @@ config DVB_USB_UMT_010 
config DVB_USB_CXUSB

	tristate "Conexant USB2.0 hybrid reference design support"

	depends on DVB_USB

	select DVB_PLL

	select DVB_PLL if !DVB_FE_CUSTOMISE

	select DVB_CX22702 if !DVB_FE_CUSTOMISE

	select DVB_LGDT330X if !DVB_FE_CUSTOMISE

	select DVB_MT352 if !DVB_FE_CUSTOMISE
@@ -142,7 +142,7 @@ config DVB_USB_AU6610 
config DVB_USB_DIGITV

	tristate "Nebula Electronics uDigiTV DVB-T USB2.0 support"

	depends on DVB_USB

	select DVB_PLL

	select DVB_PLL if !DVB_FE_CUSTOMISE

	select DVB_NXT6000 if !DVB_FE_CUSTOMISE

	select DVB_MT352 if !DVB_FE_CUSTOMISE

	help
@@ -188,6 +188,7 @@ config DVB_USB_NOVA_T_USB2 
	depends on DVB_USB

	select DVB_DIB3000MC

	select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE

	select DVB_PLL if !DVB_FE_CUSTOMISE

	help

	  Say Y here to support the Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 receiver.
@@ -216,6 +217,7 @@ config DVB_USB_OPERA1 
	tristate "Opera1 DVB-S USB2.0 receiver"

	depends on DVB_USB

	select DVB_STV0299 if !DVB_FE_CUSTOMISE

	select DVB_PLL if !DVB_FE_CUSTOMISE

	help

	  Say Y here to support the Opera DVB-S USB2.0 receiver.