mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-30 08:02:30 +00:00
Code Issues Releases Wiki Activity

V4L/DVB (7436): tda18271: add basic support for slave tuner configurations

Browse source 
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Michael Krufky 2008-04-22 14:46:23 -03:00 committed by Mauro Carvalho Chehab
parent 4efb0ca5d0
commit 868f5ccd64
3 changed files with 44 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
drivers/media/dvb/frontends/tda18271-fe.c
View file

@ -36,6 +36,15 @@ static LIST_HEAD(hybrid_tuner_instance_list);
/*---------------------------------------------------------------------*/
static inline int charge_pump_source(struct dvb_frontend *fe, int force)
{
struct tda18271_priv *priv = fe->tuner_priv;
return tda18271_charge_pump_source(fe,
(priv->role == TDA18271_SLAVE) ?
TDA18271_CAL_PLL :
TDA18271_MAIN_PLL, force);
}
static int tda18271_channel_configuration(struct dvb_frontend *fe,
struct tda18271_std_map_item *map,
u32 freq, u32 bw)
@ -97,8 +106,14 @@ static int tda18271_channel_configuration(struct dvb_frontend *fe,
/* dual tuner and agc1 extra configuration */
/* main vco when Master, cal vco when slave */
regs[R_EB1] |= 0x04; /* FIXME: assumes master */
switch (priv->role) {
case TDA18271_MASTER:
regs[R_EB1] |= 0x04; /* main vco */
break;
case TDA18271_SLAVE:
regs[R_EB1] &= ~0x04; /* cal vco */
break;
}
/* agc1 always active */
regs[R_EB1] &= ~0x02;
@ -112,19 +127,29 @@ static int tda18271_channel_configuration(struct dvb_frontend *fe,
N = map->if_freq * 1000 + freq;
/* FIXME: assumes master */
tda18271_calc_main_pll(fe, N);
tda18271_write_regs(fe, R_MPD, 4);
switch (priv->role) {
case TDA18271_MASTER:
tda18271_calc_main_pll(fe, N);
tda18271_write_regs(fe, R_MPD, 4);
break;
case TDA18271_SLAVE:
tda18271_calc_cal_pll(fe, N);
tda18271_write_regs(fe, R_CPD, 4);
regs[R_MPD] = regs[R_CPD] & 0x7f;
tda18271_write_regs(fe, R_MPD, 1);
break;
}
tda18271_write_regs(fe, R_TM, 7);
/* main pll charge pump source */
tda18271_charge_pump_source(fe, TDA18271_MAIN_PLL, 1);
/* force charge pump source */
charge_pump_source(fe, 1);
msleep(1);
/* normal operation for the main pll */
tda18271_charge_pump_source(fe, TDA18271_MAIN_PLL, 0);
/* return pll to normal operation */
charge_pump_source(fe, 0);
msleep(20);
@ -1058,6 +1083,7 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
case 1:
/* new tuner instance */
priv->gate = (cfg) ? cfg->gate : TDA18271_GATE_AUTO;
priv->role = (cfg) ? cfg->role : TDA18271_MASTER;
priv->cal_initialized = false;
mutex_init(&priv->lock);

1
drivers/media/dvb/frontends/tda18271-priv.h
View file

@ -110,6 +110,7 @@ struct tda18271_priv {
struct tuner_i2c_props i2c_props;
enum tda18271_mode mode;
enum tda18271_role role;
enum tda18271_i2c_gate gate;
enum tda18271_ver id;

8
drivers/media/dvb/frontends/tda18271.h
View file

@ -56,6 +56,11 @@ struct tda18271_std_map {
struct tda18271_std_map_item qam_8;
};
enum tda18271_role {
TDA18271_MASTER = 0,
TDA18271_SLAVE,
};
enum tda18271_i2c_gate {
TDA18271_GATE_AUTO = 0,
TDA18271_GATE_ANALOG,
@ -66,6 +71,9 @@ struct tda18271_config {
/* override default if freq / std settings (optional) */
struct tda18271_std_map *std_map;
/* master / slave tuner: master uses main pll, slave uses cal pll */
enum tda18271_role role;
/* use i2c gate provided by analog or digital demod */
enum tda18271_i2c_gate gate;