V4L/DVB (7412): use tuner-simple for LG TDVS-H06xF digital tuning support
Convert cx88-dvb, dvb-bt8xx, b2c2-flexcop, cxusb and cx23885 to use tuner-simple instead of dvb-pll for LG TDVS-H06xF Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
967be9a9cd
commit
827855d397
6 changed files with 29 additions and 13 deletions
|
@ -13,3 +13,4 @@ b2c2-flexcop-usb-objs = flexcop-usb.o
|
|||
obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o
|
||||
|
||||
EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
|
||||
EXTRA_CFLAGS += -Idrivers/media/video/
|
||||
|
|
|
@ -5,6 +5,8 @@
|
|||
*
|
||||
* see flexcop.c for copyright information.
|
||||
*/
|
||||
#include <media/tuner.h>
|
||||
|
||||
#include "flexcop.h"
|
||||
|
||||
#include "stv0299.h"
|
||||
|
@ -15,6 +17,7 @@
|
|||
#include "mt312.h"
|
||||
#include "lgdt330x.h"
|
||||
#include "dvb-pll.h"
|
||||
#include "tuner-simple.h"
|
||||
|
||||
/* lnb control */
|
||||
|
||||
|
@ -506,7 +509,8 @@ int flexcop_frontend_init(struct flexcop_device *fc)
|
|||
/* 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(simple_tuner_attach, fc->fe,
|
||||
&fc->i2c_adap, 0x61, TUNER_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 */
|
||||
|
|
|
@ -609,8 +609,9 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
|
|||
lgdt330x_reset(card);
|
||||
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);
|
||||
dvb_attach(simple_tuner_attach, card->fe,
|
||||
card->i2c_adapter, 0x61,
|
||||
TUNER_LG_TDVS_H06XF);
|
||||
dprintk ("dvb_bt8xx: lgdt330x detected\n");
|
||||
}
|
||||
break;
|
||||
|
|
|
@ -23,6 +23,8 @@
|
|||
*
|
||||
* see Documentation/dvb/README.dvb-usb for more information
|
||||
*/
|
||||
#include <media/tuner.h>
|
||||
|
||||
#include "cxusb.h"
|
||||
|
||||
#include "cx22702.h"
|
||||
|
@ -32,6 +34,7 @@
|
|||
#include "zl10353.h"
|
||||
#include "tuner-xc2028.h"
|
||||
#include "tuner-xc2028-types.h"
|
||||
#include "tuner-simple.h"
|
||||
|
||||
/* debug */
|
||||
static int dvb_usb_cxusb_debug;
|
||||
|
@ -477,8 +480,8 @@ static int cxusb_dtt7579_tuner_attach(struct dvb_usb_adapter *adap)
|
|||
|
||||
static int cxusb_lgh064f_tuner_attach(struct dvb_usb_adapter *adap)
|
||||
{
|
||||
dvb_attach(dvb_pll_attach, adap->fe, 0x61, &adap->dev->i2c_adap,
|
||||
DVB_PLL_LG_TDVS_H06XF);
|
||||
dvb_attach(simple_tuner_attach, adap->fe,
|
||||
&adap->dev->i2c_adap, 0x61, TUNER_LG_TDVS_H06XF);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -39,6 +39,7 @@
|
|||
#include "dvb-pll.h"
|
||||
#include "tuner-xc2028.h"
|
||||
#include "tuner-xc2028-types.h"
|
||||
#include "tuner-simple.h"
|
||||
|
||||
static unsigned int debug;
|
||||
|
||||
|
@ -271,8 +272,9 @@ static int dvb_register(struct cx23885_tsport *port)
|
|||
&fusionhdtv_5_express,
|
||||
&i2c_bus->i2c_adap);
|
||||
if (port->dvb.frontend != NULL) {
|
||||
dvb_attach(dvb_pll_attach, port->dvb.frontend, 0x61,
|
||||
&i2c_bus->i2c_adap, DVB_PLL_LG_TDVS_H06XF);
|
||||
dvb_attach(simple_tuner_attach, port->dvb.frontend,
|
||||
&i2c_bus->i2c_adap, 0x61,
|
||||
TUNER_LG_TDVS_H06XF);
|
||||
}
|
||||
break;
|
||||
case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
|
||||
|
|
|
@ -48,6 +48,7 @@
|
|||
#include "tuner-xc2028.h"
|
||||
#include "tuner-xc2028-types.h"
|
||||
#include "tuner-simple.h"
|
||||
#include "tda9887.h"
|
||||
|
||||
MODULE_DESCRIPTION("driver for cx2388x based DVB cards");
|
||||
MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>");
|
||||
|
@ -693,9 +694,11 @@ static int dvb_register(struct cx8802_dev *dev)
|
|||
&fusionhdtv_5_gold,
|
||||
&dev->core->i2c_adap);
|
||||
if (dev->dvb.frontend != NULL) {
|
||||
dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
|
||||
&dev->core->i2c_adap,
|
||||
DVB_PLL_LG_TDVS_H06XF);
|
||||
dvb_attach(simple_tuner_attach, dev->dvb.frontend,
|
||||
&dev->core->i2c_adap, 0x61,
|
||||
TUNER_LG_TDVS_H06XF);
|
||||
dvb_attach(tda9887_attach, dev->dvb.frontend,
|
||||
&dev->core->i2c_adap, 0x43);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
@ -713,9 +716,11 @@ static int dvb_register(struct cx8802_dev *dev)
|
|||
&pchdtv_hd5500,
|
||||
&dev->core->i2c_adap);
|
||||
if (dev->dvb.frontend != NULL) {
|
||||
dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
|
||||
&dev->core->i2c_adap,
|
||||
DVB_PLL_LG_TDVS_H06XF);
|
||||
dvb_attach(simple_tuner_attach, dev->dvb.frontend,
|
||||
&dev->core->i2c_adap, 0x61,
|
||||
TUNER_LG_TDVS_H06XF);
|
||||
dvb_attach(tda9887_attach, dev->dvb.frontend,
|
||||
&dev->core->i2c_adap, 0x43);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
Loading…
Reference in a new issue