V4L/DVB (3857): Convert sp8870 to refactored tuner code

Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove unneeded tuner calls.
Add i2c gate control function.

Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 16 insertions, 10 deletions

diff --git a/drivers/media/dvb/frontends/sp8870.c b/drivers/media/dvb/frontends/sp8870.c
index 73829e647e50..4d553c0dabb3 100644
--- a/drivers/media/dvb/frontends/sp8870.c
+++ b/drivers/media/dvb/frontends/sp8870.c
@@ -262,9 +262,10 @@ static int sp8870_set_frontend_parameters (struct dvb_frontend* fe,
         sp8870_microcontroller_stop(state);
 
         // set tuner parameters
-        sp8870_writereg(state, 0x206, 0x001);
-        state->config->pll_set(fe, p);
-        sp8870_writereg(state, 0x206, 0x000);
+        if (fe->ops->tuner_ops.set_params) {
+                fe->ops->tuner_ops.set_params(fe, p);
+                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        }
 
         // sample rate correction bit [23..17]
         sp8870_writereg(state, 0x0319, 0x000A);
@@ -349,13 +350,6 @@ static int sp8870_init (struct dvb_frontend* fe)
         sp8870_writereg(state, 0x0D00, 0x010);
         sp8870_writereg(state, 0x0D01, 0x000);
 
-        /* setup PLL */
-        if (state->config->pll_init) {
-                sp8870_writereg(state, 0x206, 0x001);
-                state->config->pll_init(fe);
-                sp8870_writereg(state, 0x206, 0x000);
-        }
-
         return 0;
 }
 
@@ -541,6 +535,17 @@ static int sp8870_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend
         return 0;
 }
 
+static int sp8870_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)
+{
+        struct sp8870_state* state = fe->demodulator_priv;
+
+        if (enable) {
+                return sp8870_writereg(state, 0x206, 0x001);
+        } else {
+                return sp8870_writereg(state, 0x206, 0x000);
+        }
+}
+
 static void sp8870_release(struct dvb_frontend* fe)
 {
         struct sp8870_state* state = fe->demodulator_priv;
@@ -597,6 +602,7 @@ static struct dvb_frontend_ops sp8870_ops = {
 
         .init = sp8870_init,
         .sleep = sp8870_sleep,
+        .i2c_gate_ctrl = sp8870_i2c_gate_ctrl,
 
         .set_frontend = sp8870_set_frontend,
         .get_tune_settings = sp8870_get_tune_settings,