openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

V4L/DVB (3849): Convert mt312 to refactored tuner code 

Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove unneeded tuner calls.
Add i2c gate control function.

Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Andrew de Quincey 2006-04-18 17:47:09 -03:00 committed by Mauro Carvalho Chehab
parent 0244422220
commit a81870e00b
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/media/dvb/frontends/mt312.c
View File

@ -277,12 +277,6 @@ static int mt312_initfe(struct dvb_frontend* fe)
if ((ret = mt312_writereg(state, CS_SW_LIM, 0x69)) < 0) if ((ret = mt312_writereg(state, CS_SW_LIM, 0x69)) < 0)
return ret; return ret;
if (state->config->pll_init) {
mt312_writereg(state, GPP_CTRL, 0x40);
state->config->pll_init(fe);
mt312_writereg(state, GPP_CTRL, 0x00);
}
return 0; return 0;
} }
@ -529,9 +523,10 @@ static int mt312_set_frontend(struct dvb_frontend* fe,
return -EINVAL; return -EINVAL;
} }
mt312_writereg(state, GPP_CTRL, 0x40); if (fe->ops->tuner_ops.set_params) {
state->config->pll_set(fe, p); fe->ops->tuner_ops.set_params(fe, p);
mt312_writereg(state, GPP_CTRL, 0x00); if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
}
/* sr = (u16)(sr * 256.0 / 1000000.0) */ /* sr = (u16)(sr * 256.0 / 1000000.0) */
sr = mt312_div(p->u.qpsk.symbol_rate * 4, 15625); sr = mt312_div(p->u.qpsk.symbol_rate * 4, 15625);
@ -578,6 +573,17 @@ static int mt312_get_frontend(struct dvb_frontend* fe,
return 0; return 0;
} }
static int mt312_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)
{
struct mt312_state* state = fe->demodulator_priv;
if (enable) {
return mt312_writereg(state, GPP_CTRL, 0x40);
} else {
return mt312_writereg(state, GPP_CTRL, 0x00);
}
}
static int mt312_sleep(struct dvb_frontend* fe) static int mt312_sleep(struct dvb_frontend* fe)
{ {
struct mt312_state *state = fe->demodulator_priv; struct mt312_state *state = fe->demodulator_priv;
@ -633,6 +639,7 @@ static struct dvb_frontend_ops vp310_mt312_ops = {
.init = mt312_initfe, .init = mt312_initfe,
.sleep = mt312_sleep, .sleep = mt312_sleep,
.i2c_gate_ctrl = mt312_i2c_gate_ctrl,
.set_frontend = mt312_set_frontend, .set_frontend = mt312_set_frontend,
.get_frontend = mt312_get_frontend, .get_frontend = mt312_get_frontend,

4
drivers/media/dvb/frontends/mt312.h
View File

@ -32,10 +32,6 @@ struct mt312_config
{ {
/* the demodulator's i2c address */ /* the demodulator's i2c address */
u8 demod_address; u8 demod_address;
/* PLL maintenance */
int (*pll_init)(struct dvb_frontend* fe);
int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);
}; };
struct dvb_frontend* vp310_mt312_attach(const struct mt312_config* config, struct dvb_frontend* vp310_mt312_attach(const struct mt312_config* config,