---

yaml --- r: 250122 b: refs/heads/master c: 6b142b3 h: refs/heads/master v: v3
git-mirror · May 20, 2011 · 83c11f3 · 83c11f3
1 parent 58c3fe9
commit 83c11f3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e5659067892d94d859f8ae4c1129a84fe4d5244
+refs/heads/master: 6b142b3c81e6e532dfad7256fcc7e75fded49245
diff --git a/trunk/drivers/media/dvb/frontends/drxd.h b/trunk/drivers/media/dvb/frontends/drxd.h
@@ -44,6 +44,10 @@ struct drxd_config
 	u8 demoda_address;
 	u8 demod_revision;
 
+	/* If the tuner is not behind an i2c gate, be sure to flip this bit
+	   or else the i2c bus could get wedged */
+	u8 disable_i2c_gate_ctrl;
+
 	u32 IF;
 	int (*pll_set)       (void *priv, void *priv_params,
 			      u8 pll_addr, u8 demoda_addr, s32 *off);

diff --git a/trunk/drivers/media/dvb/frontends/drxd_hard.c b/trunk/drivers/media/dvb/frontends/drxd_hard.c
@@ -2662,6 +2662,9 @@ int drxd_config_i2c(struct dvb_frontend *fe, int onoff)
 {
 	struct drxd_state *state=fe->demodulator_priv;
 
+	if (state->config.disable_i2c_gate_ctrl == 1)
+		return 0;
+
 	return DRX_ConfigureI2CBridge(state, onoff);
 }
 

diff --git a/trunk/drivers/media/video/em28xx/em28xx-dvb.c b/trunk/drivers/media/video/em28xx/em28xx-dvb.c
@@ -291,6 +291,7 @@ static struct drxd_config em28xx_drxd = {
 	.demoda_address = 0x00, .pll_address = 0x00,
 	.pll_type = DRXD_PLL_NONE, .clock = 12000, .insert_rs_byte = 1,
 	.pll_set = NULL, .osc_deviation = NULL, .IF = 42800000,
+	.disable_i2c_gate_ctrl = 1,
 };
 
 static int mt352_terratec_xs_init(struct dvb_frontend *fe)