Skip to content

Commit

Permalink
V4L/DVB (3890): Add support for non-attached tuners to zl10353
Browse files Browse the repository at this point in the history
Add no_tuner setting like in mt352.
Update to use correct tuner API calls.

Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Andrew de Quincey authored and Mauro Carvalho Chehab committed Jun 25, 2006
1 parent 4e2ecca commit 8dec073
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
24 changes: 23 additions & 1 deletion drivers/media/dvb/frontends/zl10353.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ static int zl10353_sleep(struct dvb_frontend *fe)
static int zl10353_set_parameters(struct dvb_frontend *fe,
struct dvb_frontend_parameters *param)
{
struct zl10353_state *state = fe->demodulator_priv;

u8 pllbuf[6] = { 0x67 };

/* These settings set "auto-everything" and start the FSM. */
Expand All @@ -141,12 +143,32 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,
zl10353_single_write(fe, 0x66, 0xE9);
zl10353_single_write(fe, 0x62, 0x0A);

// if there is no attached secondary tuner, we call set_params to program
// a potential tuner attached somewhere else
if (state->config.no_tuner) {
if (fe->ops->tuner_ops.set_params) {
fe->ops->tuner_ops.set_params(fe, param);
if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
}
}

// if pllbuf is defined, retrieve the settings
if (fe->ops->tuner_ops.pllbuf) {
fe->ops->tuner_ops.pllbuf(fe, param, pllbuf+1, 5);
pllbuf[1] <<= 1;
zl10353_write(fe, pllbuf, sizeof(pllbuf));
} else {
// fake pllbuf settings
pllbuf[1] = 0x61 << 1;
pllbuf[2] = 0;
pllbuf[3] = 0;
pllbuf[3] = 0;
pllbuf[4] = 0;
}

// there is no call to _just_ start decoding, so we send the pllbuf anyway
// even if there isn't a PLL attached to the secondary bus
zl10353_write(fe, pllbuf, sizeof(pllbuf));

zl10353_single_write(fe, 0x70, 0x01);
udelay(250);
zl10353_single_write(fe, 0xE4, 0x00);
Expand Down
3 changes: 3 additions & 0 deletions drivers/media/dvb/frontends/zl10353.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ struct zl10353_config
{
/* demodulator's I2C address */
u8 demod_address;

/* set if no pll is connected to the secondary i2c bus */
int no_tuner;
};

extern struct dvb_frontend* zl10353_attach(const struct zl10353_config *config,
Expand Down

0 comments on commit 8dec073

Please sign in to comment.