mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-07 06:52:07 +00:00
V4L/DVB (4944): Cx88: Convert DViCO FusionHDTV Hybrid to use dvb_pll_attach
Converted DViCO FusionHDTV Hybrid to use dvb_pll_attach, removing another static dependency of cx88-dvb on dvb-pll. Acked-by: Chris Pascoe <c.pascoe@itee.uq.edu.au> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
1d4bb7d3c1
commit
5786a34b43
1 changed files with 3 additions and 32 deletions
|
@ -268,35 +268,6 @@ static struct mt352_config dntv_live_dvbt_pro_config = {
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static int dvico_hybrid_tuner_set_params(struct dvb_frontend *fe,
|
|
||||||
struct dvb_frontend_parameters *params)
|
|
||||||
{
|
|
||||||
u8 pllbuf[4];
|
|
||||||
struct cx8802_dev *dev= fe->dvb->priv;
|
|
||||||
struct i2c_msg msg =
|
|
||||||
{ .addr = dev->core->pll_addr, .flags = 0,
|
|
||||||
.buf = pllbuf, .len = 4 };
|
|
||||||
int err;
|
|
||||||
|
|
||||||
dvb_pll_configure(dev->core->pll_desc, pllbuf,
|
|
||||||
params->frequency,
|
|
||||||
params->u.ofdm.bandwidth);
|
|
||||||
|
|
||||||
if (fe->ops.i2c_gate_ctrl)
|
|
||||||
fe->ops.i2c_gate_ctrl(fe, 1);
|
|
||||||
if ((err = i2c_transfer(&dev->core->i2c_adap, &msg, 1)) != 1) {
|
|
||||||
printk(KERN_WARNING "cx88-dvb: %s error "
|
|
||||||
"(addr %02x <- %02x, err = %i)\n",
|
|
||||||
__FUNCTION__, pllbuf[0], pllbuf[1], err);
|
|
||||||
if (err < 0)
|
|
||||||
return err;
|
|
||||||
else
|
|
||||||
return -EREMOTEIO;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct zl10353_config dvico_fusionhdtv_hybrid = {
|
static struct zl10353_config dvico_fusionhdtv_hybrid = {
|
||||||
.demod_address = 0x0f,
|
.demod_address = 0x0f,
|
||||||
.no_tuner = 1,
|
.no_tuner = 1,
|
||||||
|
@ -599,13 +570,13 @@ static int dvb_register(struct cx8802_dev *dev)
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID:
|
case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID:
|
||||||
dev->core->pll_addr = 0x61;
|
|
||||||
dev->core->pll_desc = &dvb_pll_thomson_fe6600;
|
|
||||||
dev->dvb.frontend = dvb_attach(zl10353_attach,
|
dev->dvb.frontend = dvb_attach(zl10353_attach,
|
||||||
&dvico_fusionhdtv_hybrid,
|
&dvico_fusionhdtv_hybrid,
|
||||||
&dev->core->i2c_adap);
|
&dev->core->i2c_adap);
|
||||||
if (dev->dvb.frontend != NULL) {
|
if (dev->dvb.frontend != NULL) {
|
||||||
dev->dvb.frontend->ops.tuner_ops.set_params = dvico_hybrid_tuner_set_params;
|
dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
|
||||||
|
&dev->core->i2c_adap,
|
||||||
|
&dvb_pll_thomson_fe6600);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case CX88_BOARD_PCHDTV_HD3000:
|
case CX88_BOARD_PCHDTV_HD3000:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue