aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/frontends
diff options
context:
space:
mode:
authorPatrick Boettcher <pb@linuxtv.org>2006-09-19 12:51:56 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-10-03 15:12:57 -0300
commit303cbeaaacd449545d259f82b966d070418c58af (patch)
treeea4ba58a759d6c3fd57d76496cfbfb1b23ed39b2 /drivers/media/dvb/frontends
parentV4L/DVB (4652): Misc fixes for DiB3000MC and Nova-T 500 (diff)
downloadlinux-dev-303cbeaaacd449545d259f82b966d070418c58af.tar.xz
linux-dev-303cbeaaacd449545d259f82b966d070418c58af.zip
V4L/DVB (4653): Misc fixes for Nova-T 500
- forward the clock to the slave undivided - when sleeping the 3000 do not shutdown the clock Signed-off-by: Patrick Boettcher <pb@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/frontends')
-rw-r--r--drivers/media/dvb/frontends/dib3000mc.c9
-rw-r--r--drivers/media/dvb/frontends/mt2060.h2
2 files changed, 6 insertions, 5 deletions
diff --git a/drivers/media/dvb/frontends/dib3000mc.c b/drivers/media/dvb/frontends/dib3000mc.c
index 0b051c7d5cd7..ccc813b525d6 100644
--- a/drivers/media/dvb/frontends/dib3000mc.c
+++ b/drivers/media/dvb/frontends/dib3000mc.c
@@ -312,10 +312,10 @@ static int dib3000mc_init(struct dvb_frontend *demod)
dib3000mc_write_word(state, 175, 0x0000);
dib3000mc_write_word(state, 1032, 0x012C);
}
- dib3000mc_write_word(state, 1033, 0);
+ dib3000mc_write_word(state, 1033, 0x0000);
// P_clk_cfg
- dib3000mc_write_word(state, 1037, 12592);
+ dib3000mc_write_word(state, 1037, 0x3130);
// other configurations
@@ -412,10 +412,9 @@ static int dib3000mc_sleep(struct dvb_frontend *demod)
{
struct dib3000mc_state *state = demod->demodulator_priv;
- dib3000mc_write_word(state, 1037, dib3000mc_read_word(state, 1037) | 0x0003);
dib3000mc_write_word(state, 1031, 0xFFFF);
dib3000mc_write_word(state, 1032, 0xFFFF);
- dib3000mc_write_word(state, 1033, 0xFFF4); // **** Bin2
+ dib3000mc_write_word(state, 1033, 0xFFF0);
return 0;
}
@@ -828,6 +827,8 @@ struct dvb_frontend * dib3000mc_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr
dibx000_init_i2c_master(&st->i2c_master, DIB3000MC, st->i2c_adap, st->i2c_addr);
+ dib3000mc_write_word(st, 1037, 0x3130);
+
return demod;
error:
diff --git a/drivers/media/dvb/frontends/mt2060.h b/drivers/media/dvb/frontends/mt2060.h
index fc12c790f913..34a37c2b556f 100644
--- a/drivers/media/dvb/frontends/mt2060.h
+++ b/drivers/media/dvb/frontends/mt2060.h
@@ -27,7 +27,7 @@ struct i2c_adapter;
struct mt2060_config {
u8 i2c_address;
- u8 clock_out; /* 0 = off, 1 = CLK/1, 2 = CLK/2, 3 = CLK/4 */
+ u8 clock_out; /* 0 = off, 1 = CLK/4, 2 = CLK/2, 3 = CLK/1 */
};
extern struct dvb_frontend * mt2060_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct mt2060_config *cfg, u16 if1);