diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-29 04:37:46 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-29 04:37:46 -0300 |
| commit | be91c19fe859cc841a29603d943e915f7691bc95 (patch) | |
| tree | b72344c4a1f05605d2b66cefd90c051737197376 /linux/drivers/media/dvb/frontends/zl10353.c | |
| parent | 01a9b73d338c6ac427e752fbc56c85d1ab5259b9 (diff) | |
| parent | 2cc0abb17583ba0769357943dee38920a8cd757e (diff) | |
| download | mediapointer-dvb-s2-be91c19fe859cc841a29603d943e915f7691bc95.tar.gz mediapointer-dvb-s2-be91c19fe859cc841a29603d943e915f7691bc95.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tuner
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/frontends/zl10353.c')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/zl10353.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/frontends/zl10353.c b/linux/drivers/media/dvb/frontends/zl10353.c index 96ccc1720..6b58bf961 100644 --- a/linux/drivers/media/dvb/frontends/zl10353.c +++ b/linux/drivers/media/dvb/frontends/zl10353.c @@ -581,6 +581,10 @@ static int zl10353_init(struct dvb_frontend *fe) #endif if (state->config.parallel_ts) zl10353_reset_attach[2] &= ~0x20; + if (state->config.clock_ctl_1) + zl10353_reset_attach[3] = state->config.clock_ctl_1; + if (state->config.pll_0) + zl10353_reset_attach[4] = state->config.pll_0; /* Do a "hard" reset if not already done */ if (zl10353_read_register(state, 0x50) != zl10353_reset_attach[1] || @@ -625,6 +629,7 @@ struct dvb_frontend *zl10353_attach(const struct zl10353_config *config, struct i2c_adapter *i2c) { struct zl10353_state *state = NULL; + int id; /* allocate memory for the internal state */ state = kzalloc(sizeof(struct zl10353_state), GFP_KERNEL); @@ -636,7 +641,8 @@ struct dvb_frontend *zl10353_attach(const struct zl10353_config *config, memcpy(&state->config, config, sizeof(struct zl10353_config)); /* check if the demod is there */ - if (zl10353_read_register(state, CHIP_ID) != ID_ZL10353) + id = zl10353_read_register(state, CHIP_ID); + if ((id != ID_ZL10353) && (id != ID_CE6230) && (id != ID_CE6231)) goto error; /* create dvb_frontend */ |