aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/dvb/frontends
diff options
context:
space:
mode:
authorAndrew de Quincey <adq_dvb@lidskialf.net>2006-04-18 17:47:12 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 01:59:18 -0300
commit8dec073225b0926a26656f416a8d32573205a78f (patch)
tree0ab93538c8e369bd7f52c5348d0a5db9a550ec4f /drivers/media/dvb/frontends
parent4e2eccae27d13d756826533e7cd1214b5825d97c (diff)
V4L/DVB (3890): Add support for non-attached tuners to zl10353
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>
Diffstat (limited to 'drivers/media/dvb/frontends')
-rw-r--r--drivers/media/dvb/frontends/zl10353.c24
-rw-r--r--drivers/media/dvb/frontends/zl10353.h3
2 files changed, 26 insertions, 1 deletions
diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
index 73fe40b50fc..1234eb0070d 100644
--- a/drivers/media/dvb/frontends/zl10353.c
+++ b/drivers/media/dvb/frontends/zl10353.c
@@ -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. */
@@ -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);
diff --git a/drivers/media/dvb/frontends/zl10353.h b/drivers/media/dvb/frontends/zl10353.h
index 63c36ec02ad..9770cb840cf 100644
--- a/drivers/media/dvb/frontends/zl10353.h
+++ b/drivers/media/dvb/frontends/zl10353.h
@@ -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,