V4L/DVB (3089): Adding support for the Hauppauge HVR1100 and HVR1100-LP products.

- Add support for the Hauppauge HVR1100 and HVR1100-LP products.
- Add i2c_gate_ctrl callback function to dvb_frontend_ops struct.

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

2 files changed, 17 insertions, 6 deletions

diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h
index 48c3f81be912..f40ee4efbe31 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -85,6 +85,7 @@ struct dvb_frontend_ops {
         int (*set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage);
         int (*enable_high_lnb_voltage)(struct dvb_frontend* fe, int arg);
         int (*dishnetwork_send_legacy_command)(struct dvb_frontend* fe, unsigned int cmd);
+        int (*i2c_gate_ctrl)(struct dvb_frontend* fe, int enable);
 };
 
 #define MAX_EVENT 8
diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c
index 5de0e6d350b1..0fc899f81c5e 100644
--- a/drivers/media/dvb/frontends/cx22702.c
+++ b/drivers/media/dvb/frontends/cx22702.c
@@ -195,6 +195,16 @@ static int cx22702_get_tps (struct cx22702_state *state, struct dvb_ofdm_paramet
         return 0;
 }
 
+static int cx22702_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)
+{
+        struct cx22702_state* state = fe->demodulator_priv;
+        dprintk ("%s(%d)\n", __FUNCTION__, enable);
+        if (enable)
+                return cx22702_writereg (state, 0x0D, cx22702_readreg(state, 0x0D) & 0xfe);
+        else
+                return cx22702_writereg (state, 0x0D, cx22702_readreg(state, 0x0D) | 1);
+}
+
 /* Talk to the demod, set the FEC, GUARD, QAM settings etc */
 static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
@@ -202,7 +212,7 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet
         struct cx22702_state* state = fe->demodulator_priv;
 
         /* set PLL */
-        cx22702_writereg (state, 0x0D, cx22702_readreg(state,0x0D) &0xfe);
+        cx22702_i2c_gate_ctrl(fe, 1);
         if (state->config->pll_set) {
                 state->config->pll_set(fe, p);
         } else if (state->config->pll_desc) {
@@ -216,7 +226,7 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet
         } else {
                 BUG();
         }
-        cx22702_writereg (state, 0x0D, cx22702_readreg(state,0x0D) | 1);
+        cx22702_i2c_gate_ctrl(fe, 0);
 
         /* set inversion */
         cx22702_set_inversion (state, p->inversion);
@@ -349,11 +359,10 @@ static int cx22702_init (struct dvb_frontend* fe)
         cx22702_writereg (state, 0xf8, (state->config->output_mode << 1) & 0x02);
 
         /* init PLL */
-        if (state->config->pll_init) {
-                cx22702_writereg (state, 0x0D, cx22702_readreg(state,0x0D) & 0xfe);
+        if (state->config->pll_init)
                 state->config->pll_init(fe);
-                cx22702_writereg (state, 0x0D, cx22702_readreg(state,0x0D) | 1);
-        }
+
+        cx22702_i2c_gate_ctrl(fe, 0);
 
         return 0;
 }
@@ -531,6 +540,7 @@ static struct dvb_frontend_ops cx22702_ops = {
         .read_signal_strength = cx22702_read_signal_strength,
         .read_snr = cx22702_read_snr,
         .read_ucblocks = cx22702_read_ucblocks,
+        .i2c_gate_ctrl = cx22702_i2c_gate_ctrl,
 };
 
 module_param(debug, int, 0644);