V4L/DVB (6433): Move all tda8275/8275a tuning code from tda8290 module into tda827x module

Add analog tuning support to tda827x dvb_frontend tuner module.

Convert tda8290 module back to native tuner interface.

The tda8290 analog demodulator will be handled the same way as tda9887.
The tuner.ko module (tuner-core) will pass commands to tda8290 via the
tuner_operations interface.  tda8290 will communicate with tda827x via
the dvb_frontend interface, while passing a pointer to a private data
structure.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Reviewed-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

6 files changed, 423 insertions, 507 deletions

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index dfb52592451f..d363d0cae38b 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -107,6 +107,7 @@ config TUNER_MT20XX
 config TUNER_TDA8290
         tristate "TDA 8290+8275(a) tuner combo"
         depends on I2C
+        select DVB_TDA827X
         default m if VIDEO_TUNER_CUSTOMIZE
         help
           Say Y here to include support for Philips TDA8290+8275(a) tuner.
diff --git a/drivers/media/dvb/frontends/tda827x.c b/drivers/media/dvb/frontends/tda827x.c
index 256fc4bf500b..3c71f07a6d2c 100644
--- a/drivers/media/dvb/frontends/tda827x.c
+++ b/drivers/media/dvb/frontends/tda827x.c
@@ -19,12 +19,16 @@
  */
 
 #include <linux/module.h>
-#include <linux/dvb/frontend.h>
 #include <asm/types.h>
+#include <linux/dvb/frontend.h>
+#include <linux/videodev2.h>
 
 #include "tda827x.h"
 
 static int debug = 0;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
+
 #define dprintk(args...) \
         do {                                        \
                 if (debug) printk(KERN_DEBUG "tda827x: " args); \
@@ -48,7 +52,7 @@ struct tda827x_data {
         u8 div1p5;
 };
 
-static const struct tda827x_data tda827x_dvbt[] = {
+static const struct tda827x_data tda827x_table[] = {
         { .lomax =  62000000, .spd = 3, .bs = 2, .bp = 0, .cp = 0, .gc3 = 3, .div1p5 = 1},
         { .lomax =  66000000, .spd = 3, .bs = 3, .bp = 0, .cp = 0, .gc3 = 3, .div1p5 = 1},
         { .lomax =  76000000, .spd = 3, .bs = 1, .bp = 0, .cp = 0, .gc3 = 3, .div1p5 = 0},
@@ -106,21 +110,22 @@ static int tda827xo_set_params(struct dvb_frontend *fe,
         tuner_freq = params->frequency + if_freq;
 
         i = 0;
-        while (tda827x_dvbt[i].lomax < tuner_freq) {
-                if(tda827x_dvbt[i + 1].lomax == 0)
+        while (tda827x_table[i].lomax < tuner_freq) {
+                if (tda827x_table[i + 1].lomax == 0)
                         break;
                 i++;
         }
 
-        N = ((tuner_freq + 125000) / 250000) << (tda827x_dvbt[i].spd + 2);
+        N = ((tuner_freq + 125000) / 250000) << (tda827x_table[i].spd + 2);
         buf[0] = 0;
         buf[1] = (N>>8) | 0x40;
         buf[2] = N & 0xff;
         buf[3] = 0;
         buf[4] = 0x52;
-        buf[5] = (tda827x_dvbt[i].spd << 6) + (tda827x_dvbt[i].div1p5 << 5) +
-                                (tda827x_dvbt[i].bs << 3) + tda827x_dvbt[i].bp;
-        buf[6] = (tda827x_dvbt[i].gc3 << 4) + 0x8f;
+        buf[5] = (tda827x_table[i].spd << 6) + (tda827x_table[i].div1p5 << 5) +
+                                (tda827x_table[i].bs << 3) +
+                                tda827x_table[i].bp;
+        buf[6] = (tda827x_table[i].gc3 << 4) + 0x8f;
         buf[7] = 0xbf;
         buf[8] = 0x2a;
         buf[9] = 0x05;
@@ -140,7 +145,7 @@ static int tda827xo_set_params(struct dvb_frontend *fe,
         msleep(500);
         /* correct CP value */
         buf[0] = 0x30;
-        buf[1] = 0x50 + tda827x_dvbt[i].cp;
+        buf[1] = 0x50 + tda827x_table[i].cp;
         msg.len = 2;
 
         if (fe->ops.i2c_gate_ctrl)
@@ -173,6 +178,100 @@ static int tda827xo_sleep(struct dvb_frontend *fe)
 
 /* ------------------------------------------------------------------ */
 
+static int tda827xo_set_analog_params(struct dvb_frontend *fe,
+                                      struct analog_parameters *params)
+{
+        unsigned char tuner_reg[8];
+        unsigned char reg2[2];
+        u32 N;
+        int i;
+        struct tda827x_priv *priv = fe->tuner_priv;
+        struct i2c_msg msg = { .addr = priv->i2c_addr, .flags = 0 };
+        unsigned int freq = params->frequency;
+
+        if (params->mode == V4L2_TUNER_RADIO)
+                freq = freq / 1000;
+
+        N = freq + priv->cfg->sgIF;
+
+        i = 0;
+        while (tda827x_table[i].lomax < N * 62500) {
+                if (tda827x_table[i + 1].lomax == 0)
+                        break;
+                i++;
+        }
+
+        N = N << tda827x_table[i].spd;
+
+        tuner_reg[0] = 0;
+        tuner_reg[1] = (unsigned char)(N>>8);
+        tuner_reg[2] = (unsigned char) N;
+        tuner_reg[3] = 0x40;
+        tuner_reg[4] = 0x52 + (priv->cfg->tda827x_lpsel << 5);
+        tuner_reg[5] = (tda827x_table[i].spd    << 6) +
+                       (tda827x_table[i].div1p5 << 5) +
+                       (tda827x_table[i].bs     << 3) + tda827x_table[i].bp;
+        tuner_reg[6] = 0x8f + (tda827x_table[i].gc3 << 4);
+        tuner_reg[7] = 0x8f;
+
+        msg.buf = tuner_reg;
+        msg.len = 8;
+        i2c_transfer(priv->i2c_adap, &msg, 1);
+
+        msg.buf = reg2;
+        msg.len = 2;
+        reg2[0] = 0x80;
+        reg2[1] = 0;
+        i2c_transfer(priv->i2c_adap, &msg, 1);
+
+        reg2[0] = 0x60;
+        reg2[1] = 0xbf;
+        i2c_transfer(priv->i2c_adap, &msg, 1);
+
+        reg2[0] = 0x30;
+        reg2[1] = tuner_reg[4] + 0x80;
+        i2c_transfer(priv->i2c_adap, &msg, 1);
+
+        msleep(1);
+        reg2[0] = 0x30;
+        reg2[1] = tuner_reg[4] + 4;
+        i2c_transfer(priv->i2c_adap, &msg, 1);
+
+        msleep(1);
+        reg2[0] = 0x30;
+        reg2[1] = tuner_reg[4];
+        i2c_transfer(priv->i2c_adap, &msg, 1);
+
+        msleep(550);
+        reg2[0] = 0x30;
+        reg2[1] = (tuner_reg[4] & 0xfc) + tda827x_table[i].cp;
+        i2c_transfer(priv->i2c_adap, &msg, 1);
+
+        reg2[0] = 0x60;
+        reg2[1] = 0x3f;
+        i2c_transfer(priv->i2c_adap, &msg, 1);
+
+        reg2[0] = 0x80;
+        reg2[1] = 0x08;   /* Vsync en */
+        i2c_transfer(priv->i2c_adap, &msg, 1);
+
+        priv->frequency = freq * 62500;
+
+        return 0;
+}
+
+static void tda827xo_agcf(struct dvb_frontend *fe)
+{
+        struct tda827x_priv *priv = fe->tuner_priv;
+        unsigned char data[] = { 0x80, 0x0c };
+        struct i2c_msg msg = { .addr = priv->i2c_addr, .flags = 0,
+                               .buf = data, .len = 2};
+
+        i2c_transfer(priv->i2c_adap, &msg, 1);
+}
+
+/* ------------------------------------------------------------------ */
+
 struct tda827xa_data {
         u32 lomax;
         u8  svco;
@@ -212,6 +311,35 @@ static const struct tda827xa_data tda827xa_dvbt[] = {
         { .lomax =         0, .svco = 0, .spd = 0, .scr = 0, .sbs = 0, .gc3 = 0}
 };
 
+static struct tda827xa_data tda827xa_analog[] = {
+        { .lomax =  56875000, .svco = 3, .spd = 4, .scr = 0, .sbs = 0, .gc3 = 3},
+        { .lomax =  67250000, .svco = 0, .spd = 3, .scr = 0, .sbs = 0, .gc3 = 3},
+        { .lomax =  81250000, .svco = 1, .spd = 3, .scr = 0, .sbs = 0, .gc3 = 3},
+        { .lomax =  97500000, .svco = 2, .spd = 3, .scr = 0, .sbs = 0, .gc3 = 3},
+        { .lomax = 113750000, .svco = 3, .spd = 3, .scr = 0, .sbs = 1, .gc3 = 1},
+        { .lomax = 134500000, .svco = 0, .spd = 2, .scr = 0, .sbs = 1, .gc3 = 1},
+        { .lomax = 154000000, .svco = 1, .spd = 2, .scr = 0, .sbs = 1, .gc3 = 1},
+        { .lomax = 162500000, .svco = 1, .spd = 2, .scr = 0, .sbs = 1, .gc3 = 1},
+        { .lomax = 183000000, .svco = 2, .spd = 2, .scr = 0, .sbs = 1, .gc3 = 1},
+        { .lomax = 195000000, .svco = 2, .spd = 2, .scr = 0, .sbs = 2, .gc3 = 1},
+        { .lomax = 227500000, .svco = 3, .spd = 2, .scr = 0, .sbs = 2, .gc3 = 3},
+        { .lomax = 269000000, .svco = 0, .spd = 1, .scr = 0, .sbs = 2, .gc3 = 3},
+        { .lomax = 325000000, .svco = 1, .spd = 1, .scr = 0, .sbs = 2, .gc3 = 1},
+        { .lomax = 390000000, .svco = 2, .spd = 1, .scr = 0, .sbs = 3, .gc3 = 3},
+        { .lomax = 455000000, .svco = 3, .spd = 1, .scr = 0, .sbs = 3, .gc3 = 3},
+        { .lomax = 520000000, .svco = 0, .spd = 0, .scr = 0, .sbs = 3, .gc3 = 1},
+        { .lomax = 538000000, .svco = 0, .spd = 0, .scr = 1, .sbs = 3, .gc3 = 1},
+        { .lomax = 554000000, .svco = 1, .spd = 0, .scr = 0, .sbs = 3, .gc3 = 1},
+        { .lomax = 620000000, .svco = 1, .spd = 0, .scr = 0, .sbs = 4, .gc3 = 0},
+        { .lomax = 650000000, .svco = 1, .spd = 0, .scr = 1, .sbs = 4, .gc3 = 0},
+        { .lomax = 700000000, .svco = 2, .spd = 0, .scr = 0, .sbs = 4, .gc3 = 0},
+        { .lomax = 780000000, .svco = 2, .spd = 0, .scr = 1, .sbs = 4, .gc3 = 0},
+        { .lomax = 820000000, .svco = 3, .spd = 0, .scr = 0, .sbs = 4, .gc3 = 0},
+        { .lomax = 870000000, .svco = 3, .spd = 0, .scr = 1, .sbs = 4, .gc3 = 0},
+        { .lomax = 911000000, .svco = 3, .spd = 0, .scr = 2, .sbs = 4, .gc3 = 0},
+        { .lomax =         0, .svco = 0, .spd = 0, .scr = 0, .sbs = 0, .gc3 = 0}
+};
+
 static int tda827xa_set_params(struct dvb_frontend *fe,
                                struct dvb_frontend_parameters *params)
 {
@@ -368,6 +496,156 @@ static int tda827xa_sleep(struct dvb_frontend *fe)
         return 0;
 }
 
+/* ------------------------------------------------------------------ */
+
+static void tda827xa_lna_gain(struct dvb_frontend *fe, int high,
+                              struct analog_parameters *params)
+{
+        struct tda827x_priv *priv = fe->tuner_priv;
+        unsigned char buf[] = {0x22, 0x01};
+        int arg;
+        struct i2c_msg msg = { .addr = priv->i2c_addr, .flags = 0,
+                               .buf = buf, .len = sizeof(buf) };
+
+        if (priv->cfg->config) {
+                if (high)
+                        dprintk("setting LNA to high gain\n");
+                else
+                        dprintk("setting LNA to low gain\n");
+        }
+        switch (*priv->cfg->config) {
+        case 0: /* no LNA */
+                break;
+        case 1: /* switch is GPIO 0 of tda8290 */
+        case 2:
+                /* turn Vsync on */
+                if (params->std & V4L2_STD_MN)
+                        arg = 1;
+                else
+                        arg = 0;
+                if (priv->cfg->tuner_callback)
+                        priv->cfg->tuner_callback(priv->i2c_adap->algo_data,
+                                                  1, arg);
+                buf[1] = high ? 0 : 1;
+                if (*priv->cfg->config == 2)
+                        buf[1] = high ? 1 : 0;
+                i2c_transfer(priv->i2c_adap, &msg, 1);
+                break;
+        case 3: /* switch with GPIO of saa713x */
+                if (priv->cfg->tuner_callback)
+                        priv->cfg->tuner_callback(priv->i2c_adap->algo_data,
+                                                  0, high);
+                break;
+        }
+}
+
+static int tda827xa_set_analog_params(struct dvb_frontend *fe,
+                                      struct analog_parameters *params)
+{
+        unsigned char tuner_reg[11];
+        u32 N;
+        int i;
+        struct tda827x_priv *priv = fe->tuner_priv;
+        struct i2c_msg msg = { .addr = priv->i2c_addr, .flags = 0,
+                               .buf = tuner_reg, .len = sizeof(tuner_reg) };
+        unsigned int freq = params->frequency;
+
+        tda827xa_lna_gain(fe, 1, params);
+        msleep(10);
+
+        if (params->mode == V4L2_TUNER_RADIO)
+                freq = freq / 1000;
+
+        N = freq + priv->cfg->sgIF;
+
+        i = 0;
+        while (tda827xa_analog[i].lomax < N * 62500) {
+                if (tda827xa_analog[i + 1].lomax == 0)
+                        break;
+                i++;
+        }
+
+        N = N << tda827xa_analog[i].spd;
+
+        tuner_reg[0] = 0;
+        tuner_reg[1] = (unsigned char)(N>>8);
+        tuner_reg[2] = (unsigned char) N;
+        tuner_reg[3] = 0;
+        tuner_reg[4] = 0x16;
+        tuner_reg[5] = (tda827xa_analog[i].spd << 5) +
+                       (tda827xa_analog[i].svco << 3) +
+                        tda827xa_analog[i].sbs;
+        tuner_reg[6] = 0x8b + (tda827xa_analog[i].gc3 << 4);
+        tuner_reg[7] = 0x1c;
+        tuner_reg[8] = 4;
+        tuner_reg[9] = 0x20;
+        tuner_reg[10] = 0x00;
+        msg.len = 11;
+        i2c_transfer(priv->i2c_adap, &msg, 1);
+
+        tuner_reg[0] = 0x90;
+        tuner_reg[1] = 0xff;
+        tuner_reg[2] = 0xe0;
+        tuner_reg[3] = 0;
+        tuner_reg[4] = 0x99 + (priv->cfg->tda827x_lpsel << 1);
+        msg.len = 5;
+        i2c_transfer(priv->i2c_adap, &msg, 1);
+
+        tuner_reg[0] = 0xa0;
+        tuner_reg[1] = 0xc0;
+        msg.len = 2;
+        i2c_transfer(priv->i2c_adap, &msg, 1);
+
+        tuner_reg[0] = 0x30;
+        tuner_reg[1] = 0x10 + tda827xa_analog[i].scr;
+        i2c_transfer(priv->i2c_adap, &msg, 1);
+
+        msg.flags = I2C_M_RD;
+        i2c_transfer(priv->i2c_adap, &msg, 1);
+        msg.flags = 0;
+        tuner_reg[1] >>= 4;
+        dprintk("AGC2 gain is: %d\n", tuner_reg[1]);
+        if (tuner_reg[1] < 1)
+                tda827xa_lna_gain(fe, 0, params);
+
+        msleep(100);
+        tuner_reg[0] = 0x60;
+        tuner_reg[1] = 0x3c;
+        i2c_transfer(priv->i2c_adap, &msg, 1);
+
+        msleep(163);
+        tuner_reg[0] = 0x50;
+        tuner_reg[1] = 0x8f + (tda827xa_analog[i].gc3 << 4);
+        i2c_transfer(priv->i2c_adap, &msg, 1);
+
+        tuner_reg[0] = 0x80;
+        tuner_reg[1] = 0x28;
+        i2c_transfer(priv->i2c_adap, &msg, 1);
+
+        tuner_reg[0] = 0xb0;
+        tuner_reg[1] = 0x01;
+        i2c_transfer(priv->i2c_adap, &msg, 1);
+
+        tuner_reg[0] = 0xc0;
+        tuner_reg[1] = 0x19 + (priv->cfg->tda827x_lpsel << 1);
+        i2c_transfer(priv->i2c_adap, &msg, 1);
+
+        priv->frequency = freq * 62500;
+
+        return 0;
+}
+
+static void tda827xa_agcf(struct dvb_frontend *fe)
+{
+        struct tda827x_priv *priv = fe->tuner_priv;
+        unsigned char data[] = {0x80, 0x2c};
+        struct i2c_msg msg = {.addr = priv->i2c_addr, .flags = 0,
+                              .buf = data, .len = 2};
+        i2c_transfer(priv->i2c_adap, &msg, 1);
+}
+
+/* ------------------------------------------------------------------ */
+
 static int tda827x_release(struct dvb_frontend *fe)
 {
         kfree(fe->tuner_priv);
@@ -430,6 +708,7 @@ static struct dvb_tuner_ops tda827xo_tuner_ops = {
         .init = tda827x_initial_init,
         .sleep = tda827x_initial_sleep,
         .set_params = tda827xo_set_params,
+        .set_analog_params = tda827xo_set_analog_params,
         .get_frequency = tda827x_get_frequency,
         .get_bandwidth = tda827x_get_bandwidth,
 };
@@ -445,6 +724,7 @@ static struct dvb_tuner_ops tda827xa_tuner_ops = {
         .init = tda827x_init,
         .sleep = tda827xa_sleep,
         .set_params = tda827xa_set_params,
+        .set_analog_params = tda827xa_set_analog_params,
         .get_frequency = tda827x_get_frequency,
         .get_bandwidth = tda827x_get_bandwidth,
 };
@@ -465,9 +745,11 @@ static int tda827x_probe_version(struct dvb_frontend *fe)
                 dprintk("tda827x tuner found\n");
                 fe->ops.tuner_ops.init  = tda827x_init;
                 fe->ops.tuner_ops.sleep = tda827xo_sleep;
+                priv->cfg->agcf = tda827xo_agcf;
         } else {
                 dprintk("tda827xa tuner found\n");
                 memcpy(&fe->ops.tuner_ops, &tda827xa_tuner_ops, sizeof(struct dvb_tuner_ops));
+                priv->cfg->agcf = tda827xa_agcf;
         }
         return 0;
 }
@@ -487,17 +769,14 @@ struct dvb_frontend *tda827x_attach(struct dvb_frontend *fe, int addr,
         priv->i2c_adap = i2c;
         priv->cfg = cfg;
         memcpy(&fe->ops.tuner_ops, &tda827xo_tuner_ops, sizeof(struct dvb_tuner_ops));
-
         fe->tuner_priv = priv;
 
+        dprintk("type set to %s\n", fe->ops.tuner_ops.info.name);
+
         return fe;
 }
-
 EXPORT_SYMBOL(tda827x_attach);
 
-module_param(debug, int, 0644);
-MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
-
 MODULE_DESCRIPTION("DVB TDA827x driver");
 MODULE_AUTHOR("Hartmut Hackmann <hartmut.hackmann@t-online.de>");
 MODULE_AUTHOR("Michael Krufky <mkrufky@linuxtv.org>");
diff --git a/drivers/media/dvb/frontends/tda827x.h b/drivers/media/dvb/frontends/tda827x.h
index 69e8263d6d59..06626f7af614 100644
--- a/drivers/media/dvb/frontends/tda827x.h
+++ b/drivers/media/dvb/frontends/tda827x.h
@@ -29,9 +29,19 @@
 
 struct tda827x_config
 {
+        /* saa7134 - provided callbacks */
         void (*lna_gain) (struct dvb_frontend *fe, int high);
         int (*init) (struct dvb_frontend *fe);
         int (*sleep) (struct dvb_frontend *fe);
+
+        /* interface to tda829x driver */
+        unsigned char tda827x_lpsel;
+        unsigned int sgIF;
+
+        unsigned int *config;
+        int (*tuner_callback) (void *dev, int command, int arg);
+
+        void (*agcf)(struct dvb_frontend *fe);
 };
 
 
diff --git a/drivers/media/video/tda8290.c b/drivers/media/video/tda8290.c
index 0e5cf459d3ed..5d30cbcd7361 100644
--- a/drivers/media/video/tda8290.c
+++ b/drivers/media/video/tda8290.c
@@ -23,11 +23,11 @@
 #include <linux/i2c.h>
 #include <linux/delay.h>
 #include <linux/videodev.h>
-#include "tuner-i2c.h"
 #include "tda8290.h"
+#include "tda827x.h"
 
-static int debug = 0;
-module_param(debug, int, 0644);
+static int tuner_debug = 0;
+module_param_named(debug, tuner_debug, int, 0644);
 MODULE_PARM_DESC(debug, "enable verbose debug messages");
 
 #define PREFIX "tda8290 "
@@ -38,332 +38,18 @@ struct tda8290_priv {
         struct tuner_i2c_props i2c_props;
 
         unsigned char tda8290_easy_mode;
-        unsigned char tda827x_lpsel;
+
         unsigned char tda827x_addr;
         unsigned char tda827x_ver;
-        unsigned int sgIF;
-
-        u32 frequency;
-
-        unsigned int *lna_cfg;
-        int (*tuner_callback) (void *dev, int command,int arg);
-};
-
-/* ---------------------------------------------------------------------- */
-
-struct tda827x_data {
-        u32 lomax;
-        u8  spd;
-        u8  bs;
-        u8  bp;
-        u8  cp;
-        u8  gc3;
-        u8 div1p5;
-};
 
-     /* Note lomax entry is lo / 62500 */
-
-static struct tda827x_data tda827x_analog[] = {
-        { .lomax =   992, .spd = 3, .bs = 2, .bp = 0, .cp = 0, .gc3 = 3, .div1p5 = 1}, /*  62 MHz */
-        { .lomax =  1056, .spd = 3, .bs = 3, .bp = 0, .cp = 0, .gc3 = 3, .div1p5 = 1}, /*  66 MHz */
-        { .lomax =  1216, .spd = 3, .bs = 1, .bp = 0, .cp = 0, .gc3 = 3, .div1p5 = 0}, /*  76 MHz */
-        { .lomax =  1344, .spd = 3, .bs = 2, .bp = 0, .cp = 0, .gc3 = 3, .div1p5 = 0}, /*  84 MHz */
-        { .lomax =  1488, .spd = 3, .bs = 2, .bp = 0, .cp = 0, .gc3 = 1, .div1p5 = 0}, /*  93 MHz */
-        { .lomax =  1568, .spd = 3, .bs = 3, .bp = 0, .cp = 0, .gc3 = 1, .div1p5 = 0}, /*  98 MHz */
-        { .lomax =  1744, .spd = 3, .bs = 3, .bp = 1, .cp = 0, .gc3 = 1, .div1p5 = 0}, /* 109 MHz */
-        { .lomax =  1968, .spd = 2, .bs = 2, .bp = 1, .cp = 0, .gc3 = 1, .div1p5 = 1}, /* 123 MHz */
-        { .lomax =  2128, .spd = 2, .bs = 3, .bp = 1, .cp = 0, .gc3 = 1, .div1p5 = 1}, /* 133 MHz */
-        { .lomax =  2416, .spd = 2, .bs = 1, .bp = 1, .cp = 0, .gc3 = 1, .div1p5 = 0}, /* 151 MHz */
-        { .lomax =  2464, .spd = 2, .bs = 2, .bp = 1, .cp = 0, .gc3 = 1, .div1p5 = 0}, /* 154 MHz */
-        { .lomax =  2896, .spd = 2, .bs = 2, .bp = 1, .cp = 0, .gc3 = 0, .div1p5 = 0}, /* 181 MHz */
-        { .lomax =  2960, .spd = 2, .bs = 2, .bp = 2, .cp = 0, .gc3 = 1, .div1p5 = 0}, /* 185 MHz */
-        { .lomax =  3472, .spd = 2, .bs = 3, .bp = 2, .cp = 0, .gc3 = 1, .div1p5 = 0}, /* 217 MHz */
-        { .lomax =  3904, .spd = 1, .bs = 2, .bp = 2, .cp = 0, .gc3 = 1, .div1p5 = 1}, /* 244 MHz */
-        { .lomax =  4240, .spd = 1, .bs = 3, .bp = 2, .cp = 0, .gc3 = 1, .div1p5 = 1}, /* 265 MHz */
-        { .lomax =  4832, .spd = 1, .bs = 1, .bp = 2, .cp = 0, .gc3 = 1, .div1p5 = 0}, /* 302 MHz */
-        { .lomax =  5184, .spd = 1, .bs = 2, .bp = 2, .cp = 0, .gc3 = 1, .div1p5 = 0}, /* 324 MHz */
-        { .lomax =  5920, .spd = 1, .bs = 2, .bp = 3, .cp = 0, .gc3 = 1, .div1p5 = 0}, /* 370 MHz */
-        { .lomax =  7264, .spd = 1, .bs = 3, .bp = 3, .cp = 0, .gc3 = 1, .div1p5 = 0}, /* 454 MHz */
-        { .lomax =  7888, .spd = 0, .bs = 2, .bp = 3, .cp = 0, .gc3 = 1, .div1p5 = 1}, /* 493 MHz */
-        { .lomax =  8480, .spd = 0, .bs = 3, .bp = 3, .cp = 0, .gc3 = 1, .div1p5 = 1}, /* 530 MHz */
-        { .lomax =  8864, .spd = 0, .bs = 1, .bp = 3, .cp = 0, .gc3 = 1, .div1p5 = 0}, /* 554 MHz */
-        { .lomax =  9664, .spd = 0, .bs = 1, .bp = 4, .cp = 0, .gc3 = 0, .div1p5 = 0}, /* 604 MHz */
-        { .lomax = 11088, .spd = 0, .bs = 2, .bp = 4, .cp = 0, .gc3 = 0, .div1p5 = 0}, /* 696 MHz */
-        { .lomax = 11840, .spd = 0, .bs = 2, .bp = 4, .cp = 1, .gc3 = 0, .div1p5 = 0}, /* 740 MHz */
-        { .lomax = 13120, .spd = 0, .bs = 3, .bp = 4, .cp = 0, .gc3 = 0, .div1p5 = 0}, /* 820 MHz */
-        { .lomax = 13840, .spd = 0, .bs = 3, .bp = 4, .cp = 1, .gc3 = 0, .div1p5 = 0}, /* 865 MHz */
-        { .lomax =     0, .spd = 0, .bs = 0, .bp = 0, .cp = 0, .gc3 = 0, .div1p5 = 0}  /* End      */
+        struct tda827x_config cfg;
 };
 
-static void tda827x_set_analog_params(struct dvb_frontend *fe,
-                                      struct analog_parameters *params)
-{
-        unsigned char tuner_reg[8];
-        unsigned char reg2[2];
-        u32 N;
-        int i;
-        struct tda8290_priv *priv = fe->tuner_priv;
-        struct i2c_msg msg = {.addr = priv->tda827x_addr, .flags = 0};
-        unsigned int freq = params->frequency;
-
-        if (params->mode == V4L2_TUNER_RADIO)
-                freq = freq / 1000;
-
-        N = freq + priv->sgIF;
-        i = 0;
-        while (tda827x_analog[i].lomax < N) {
-                if(tda827x_analog[i + 1].lomax == 0)
-                        break;
-                i++;
-        }
-
-        N = N << tda827x_analog[i].spd;
-
-        tuner_reg[0] = 0;
-        tuner_reg[1] = (unsigned char)(N>>8);
-        tuner_reg[2] = (unsigned char) N;
-        tuner_reg[3] = 0x40;
-        tuner_reg[4] = 0x52 + (priv->tda827x_lpsel << 5);
-        tuner_reg[5] = (tda827x_analog[i].spd   << 6) + (tda827x_analog[i].div1p5 <<5) +
-                       (tda827x_analog[i].bs     <<3) +  tda827x_analog[i].bp;
-        tuner_reg[6] = 0x8f + (tda827x_analog[i].gc3 << 4);
-        tuner_reg[7] = 0x8f;
-
-        msg.buf = tuner_reg;
-        msg.len = 8;
-        i2c_transfer(priv->i2c_props.adap, &msg, 1);
-
-        msg.buf= reg2;
-        msg.len = 2;
-        reg2[0] = 0x80;
-        reg2[1] = 0;
-        i2c_transfer(priv->i2c_props.adap, &msg, 1);
-
-        reg2[0] = 0x60;
-        reg2[1] = 0xbf;
-        i2c_transfer(priv->i2c_props.adap, &msg, 1);
-
-        reg2[0] = 0x30;
-        reg2[1] = tuner_reg[4] + 0x80;
-        i2c_transfer(priv->i2c_props.adap, &msg, 1);
-
-        msleep(1);
-        reg2[0] = 0x30;
-        reg2[1] = tuner_reg[4] + 4;
-        i2c_transfer(priv->i2c_props.adap, &msg, 1);
-
-        msleep(1);
-        reg2[0] = 0x30;
-        reg2[1] = tuner_reg[4];
-        i2c_transfer(priv->i2c_props.adap, &msg, 1);
-
-        msleep(550);
-        reg2[0] = 0x30;
-        reg2[1] = (tuner_reg[4] & 0xfc) + tda827x_analog[i].cp ;
-        i2c_transfer(priv->i2c_props.adap, &msg, 1);
-
-        reg2[0] = 0x60;
-        reg2[1] = 0x3f;
-        i2c_transfer(priv->i2c_props.adap, &msg, 1);
-
-        reg2[0] = 0x80;
-        reg2[1] = 0x08;   // Vsync en
-        i2c_transfer(priv->i2c_props.adap, &msg, 1);
-}
-
-static void tda827x_agcf(struct dvb_frontend *fe)
-{
-        struct tda8290_priv *priv = fe->tuner_priv;
-        unsigned char data[] = {0x80, 0x0c};
-        struct i2c_msg msg = {.addr = priv->tda827x_addr, .buf = data,
-                              .flags = 0, .len = 2};
-        i2c_transfer(priv->i2c_props.adap, &msg, 1);
-}
-
-/* ---------------------------------------------------------------------- */
-
-struct tda827xa_data {
-        u32 lomax;
-        u8  svco;
-        u8  spd;
-        u8  scr;
-        u8  sbs;
-        u8  gc3;
-};
-
-static struct tda827xa_data tda827xa_analog[] = {
-        { .lomax =   910, .svco = 3, .spd = 4, .scr = 0, .sbs = 0, .gc3 = 3},  /*  56.875 MHz */
-        { .lomax =  1076, .svco = 0, .spd = 3, .scr = 0, .sbs = 0, .gc3 = 3},  /*  67.25 MHz */
-        { .lomax =  1300, .svco = 1, .spd = 3, .scr = 0, .sbs = 0, .gc3 = 3},  /*  81.25 MHz */
-        { .lomax =  1560, .svco = 2, .spd = 3, .scr = 0, .sbs = 0, .gc3 = 3},  /*  97.5  MHz */
-        { .lomax =  1820, .svco = 3, .spd = 3, .scr = 0, .sbs = 1, .gc3 = 1},  /* 113.75 MHz */
-        { .lomax =  2152, .svco = 0, .spd = 2, .scr = 0, .sbs = 1, .gc3 = 1},  /* 134.5 MHz */
-        { .lomax =  2464, .svco = 1, .spd = 2, .scr = 0, .sbs = 1, .gc3 = 1},  /* 154   MHz */
-        { .lomax =  2600, .svco = 1, .spd = 2, .scr = 0, .sbs = 1, .gc3 = 1},  /* 162.5 MHz */
-        { .lomax =  2928, .svco = 2, .spd = 2, .scr = 0, .sbs = 1, .gc3 = 1},  /* 183   MHz */
-        { .lomax =  3120, .svco = 2, .spd = 2, .scr = 0, .sbs = 2, .gc3 = 1},  /* 195   MHz */
-        { .lomax =  3640, .svco = 3, .spd = 2, .scr = 0, .sbs = 2, .gc3 = 3},  /* 227.5 MHz */
-        { .lomax =  4304, .svco = 0, .spd = 1, .scr = 0, .sbs = 2, .gc3 = 3},  /* 269   MHz */
-        { .lomax =  5200, .svco = 1, .spd = 1, .scr = 0, .sbs = 2, .gc3 = 1},  /* 325   MHz */
-        { .lomax =  6240, .svco = 2, .spd = 1, .scr = 0, .sbs = 3, .gc3 = 3},  /* 390   MHz */
-        { .lomax =  7280, .svco = 3, .spd = 1, .scr = 0, .sbs = 3, .gc3 = 3},  /* 455   MHz */
-        { .lomax =  8320, .svco = 0, .spd = 0, .scr = 0, .sbs = 3, .gc3 = 1},  /* 520   MHz */
-        { .lomax =  8608, .svco = 0, .spd = 0, .scr = 1, .sbs = 3, .gc3 = 1},  /* 538   MHz */
-        { .lomax =  8864, .svco = 1, .spd = 0, .scr = 0, .sbs = 3, .gc3 = 1},  /* 554   MHz */
-        { .lomax =  9920, .svco = 1, .spd = 0, .scr = 0, .sbs = 4, .gc3 = 0},  /* 620   MHz */
-        { .lomax = 10400, .svco = 1, .spd = 0, .scr = 1, .sbs = 4, .gc3 = 0},  /* 650   MHz */
-        { .lomax = 11200, .svco = 2, .spd = 0, .scr = 0, .sbs = 4, .gc3 = 0},  /* 700   MHz */
-        { .lomax = 12480, .svco = 2, .spd = 0, .scr = 1, .sbs = 4, .gc3 = 0},  /* 780   MHz */
-        { .lomax = 13120, .svco = 3, .spd = 0, .scr = 0, .sbs = 4, .gc3 = 0},  /* 820   MHz */
-        { .lomax = 13920, .svco = 3, .spd = 0, .scr = 1, .sbs = 4, .gc3 = 0},  /* 870   MHz */
-        { .lomax = 14576, .svco = 3, .spd = 0, .scr = 2, .sbs = 4, .gc3 = 0},  /* 911   MHz */
-        { .lomax =     0, .svco = 0, .spd = 0, .scr = 0, .sbs = 0, .gc3 = 0}   /* End */
-};
-
-static void tda827xa_lna_gain(struct dvb_frontend *fe, int high,
-                              struct analog_parameters *params)
-{
-        struct tda8290_priv *priv = fe->tuner_priv;
-        unsigned char buf[] = {0x22, 0x01};
-        int arg;
-        struct i2c_msg msg = {.addr = priv->i2c_props.addr, .flags = 0, .buf = buf, .len = sizeof(buf)};
-
-        if ((priv->lna_cfg == NULL)  || (priv->tuner_callback == NULL))
-            return;
-
-        if (*priv->lna_cfg) {
-                if (high)
-                        tuner_dbg("setting LNA to high gain\n");
-                else
-                        tuner_dbg("setting LNA to low gain\n");
-        }
-        switch (*priv->lna_cfg) {
-        case 0: /* no LNA */
-                break;
-        case 1: /* switch is GPIO 0 of tda8290 */
-        case 2:
-                /* turn Vsync on */
-                if (params->std & V4L2_STD_MN)
-                        arg = 1;
-                else
-                        arg = 0;
-                if (priv->tuner_callback)
-                        priv->tuner_callback(priv->i2c_props.adap->algo_data, 1, arg);
-                buf[1] = high ? 0 : 1;
-                if (*priv->lna_cfg == 2)
-                        buf[1] = high ? 1 : 0;
-                i2c_transfer(priv->i2c_props.adap, &msg, 1);
-                break;
-        case 3: /* switch with GPIO of saa713x */
-                if (priv->tuner_callback)
-                        priv->tuner_callback(priv->i2c_props.adap->algo_data, 0, high);
-                break;
-        }
-}
-
-static void tda827xa_set_analog_params(struct dvb_frontend *fe,
-                                       struct analog_parameters *params)
-{
-        unsigned char tuner_reg[11];
-        u32 N;
-        int i;
-        struct tda8290_priv *priv = fe->tuner_priv;
-        struct i2c_msg msg = {.addr = priv->tda827x_addr, .flags = 0, .buf = tuner_reg};
-        unsigned int freq = params->frequency;
-
-        tda827xa_lna_gain(fe, 1, params);
-        msleep(10);
-
-        if (params->mode == V4L2_TUNER_RADIO)
-                freq = freq / 1000;
-
-        N = freq + priv->sgIF;
-        i = 0;
-        while (tda827xa_analog[i].lomax < N) {
-                if(tda827xa_analog[i + 1].lomax == 0)
-                        break;
-                i++;
-        }
-
-        N = N << tda827xa_analog[i].spd;
-
-        tuner_reg[0] = 0;
-        tuner_reg[1] = (unsigned char)(N>>8);
-        tuner_reg[2] = (unsigned char) N;
-        tuner_reg[3] = 0;
-        tuner_reg[4] = 0x16;
-        tuner_reg[5] = (tda827xa_analog[i].spd << 5) + (tda827xa_analog[i].svco << 3) +
-                        tda827xa_analog[i].sbs;
-        tuner_reg[6] = 0x8b + (tda827xa_analog[i].gc3 << 4);
-        tuner_reg[7] = 0x1c;
-        tuner_reg[8] = 4;
-        tuner_reg[9] = 0x20;
-        tuner_reg[10] = 0x00;
-        msg.len = 11;
-        i2c_transfer(priv->i2c_props.adap, &msg, 1);
-
-        tuner_reg[0] = 0x90;
-        tuner_reg[1] = 0xff;
-        tuner_reg[2] = 0xe0;
-        tuner_reg[3] = 0;
-        tuner_reg[4] = 0x99 + (priv->tda827x_lpsel << 1);
-        msg.len = 5;
-        i2c_transfer(priv->i2c_props.adap, &msg, 1);
-
-        tuner_reg[0] = 0xa0;
-        tuner_reg[1] = 0xc0;
-        msg.len = 2;
-        i2c_transfer(priv->i2c_props.adap, &msg, 1);
-
-        tuner_reg[0] = 0x30;
-        tuner_reg[1] = 0x10 + tda827xa_analog[i].scr;
-        i2c_transfer(priv->i2c_props.adap, &msg, 1);
-
-        msg.flags = I2C_M_RD;
-        i2c_transfer(priv->i2c_props.adap, &msg, 1);
-        msg.flags = 0;
-        tuner_reg[1] >>= 4;
-        tuner_dbg("AGC2 gain is: %d\n", tuner_reg[1]);
-        if (tuner_reg[1] < 1)
-                tda827xa_lna_gain(fe, 0, params);
-
-        msleep(100);
-        tuner_reg[0] = 0x60;
-        tuner_reg[1] = 0x3c;
-        i2c_transfer(priv->i2c_props.adap, &msg, 1);
-
-        msleep(163);
-        tuner_reg[0] = 0x50;
-        tuner_reg[1] = 0x8f + (tda827xa_analog[i].gc3 << 4);
-        i2c_transfer(priv->i2c_props.adap, &msg, 1);
-
-        tuner_reg[0] = 0x80;
-        tuner_reg[1] = 0x28;
-        i2c_transfer(priv->i2c_props.adap, &msg, 1);
-
-        tuner_reg[0] = 0xb0;
-        tuner_reg[1] = 0x01;
-        i2c_transfer(priv->i2c_props.adap, &msg, 1);
-
-        tuner_reg[0] = 0xc0;
-        tuner_reg[1] = 0x19 + (priv->tda827x_lpsel << 1);
-        i2c_transfer(priv->i2c_props.adap, &msg, 1);
-}
-
-static void tda827xa_agcf(struct dvb_frontend *fe)
-{
-        struct tda8290_priv *priv = fe->tuner_priv;
-        unsigned char data[] = {0x80, 0x2c};
-        struct i2c_msg msg = {.addr = priv->tda827x_addr, .buf = data,
-                              .flags = 0, .len = 2};
-        i2c_transfer(priv->i2c_props.adap, &msg, 1);
-}
-
 /*---------------------------------------------------------------------*/
 
-static void tda8290_i2c_bridge(struct dvb_frontend *fe, int close)
+static void tda8290_i2c_bridge(struct tuner *t, int close)
 {
-        struct tda8290_priv *priv = fe->tuner_priv;
+        struct tda8290_priv *priv = t->priv;
 
         unsigned char  enable[2] = { 0x21, 0xC0 };
         unsigned char disable[2] = { 0x21, 0x00 };
@@ -381,58 +67,56 @@ static void tda8290_i2c_bridge(struct dvb_frontend *fe, int close)
 
 /*---------------------------------------------------------------------*/
 
-static void set_audio(struct dvb_frontend *fe,
-                      struct analog_parameters *params)
+static void set_audio(struct tuner *t)
 {
-        struct tda8290_priv *priv = fe->tuner_priv;
+        struct tda8290_priv *priv = t->priv;
         char* mode;
 
-        priv->tda827x_lpsel = 0;
-        if (params->std & V4L2_STD_MN) {
-                priv->sgIF = 92;
+        priv->cfg.tda827x_lpsel = 0;
+        if (t->std & V4L2_STD_MN) {
+                priv->cfg.sgIF = 92;
                 priv->tda8290_easy_mode = 0x01;
-                priv->tda827x_lpsel = 1;
+                priv->cfg.tda827x_lpsel = 1;
                 mode = "MN";
-        } else if (params->std & V4L2_STD_B) {
-                priv->sgIF = 108;
+        } else if (t->std & V4L2_STD_B) {
+                priv->cfg.sgIF = 108;
                 priv->tda8290_easy_mode = 0x02;
                 mode = "B";
-        } else if (params->std & V4L2_STD_GH) {
-                priv->sgIF = 124;
+        } else if (t->std & V4L2_STD_GH) {
+                priv->cfg.sgIF = 124;
                 priv->tda8290_easy_mode = 0x04;
                 mode = "GH";
-        } else if (params->std & V4L2_STD_PAL_I) {
-                priv->sgIF = 124;
+        } else if (t->std & V4L2_STD_PAL_I) {
+                priv->cfg.sgIF = 124;
                 priv->tda8290_easy_mode = 0x08;
                 mode = "I";
-        } else if (params->std & V4L2_STD_DK) {
-                priv->sgIF = 124;
+        } else if (t->std & V4L2_STD_DK) {
+                priv->cfg.sgIF = 124;
                 priv->tda8290_easy_mode = 0x10;
                 mode = "DK";
-        } else if (params->std & V4L2_STD_SECAM_L) {
-                priv->sgIF = 124;
+        } else if (t->std & V4L2_STD_SECAM_L) {
+                priv->cfg.sgIF = 124;
                 priv->tda8290_easy_mode = 0x20;
                 mode = "L";
-        } else if (params->std & V4L2_STD_SECAM_LC) {
-                priv->sgIF = 20;
+        } else if (t->std & V4L2_STD_SECAM_LC) {
+                priv->cfg.sgIF = 20;
                 priv->tda8290_easy_mode = 0x40;
                 mode = "LC";
         } else {
-                priv->sgIF = 124;
+                priv->cfg.sgIF = 124;
                 priv->tda8290_easy_mode = 0x10;
                 mode = "xx";
         }
 
-        if (params->mode == V4L2_TUNER_RADIO)
-                priv->sgIF = 88; /* if frequency is 5.5 MHz */
+        if (t->mode == V4L2_TUNER_RADIO)
+                priv->cfg.sgIF = 88; /* if frequency is 5.5 MHz */
 
         tuner_dbg("setting tda8290 to system %s\n", mode);
 }
 
-static int tda8290_set_params(struct dvb_frontend *fe,
-                              struct analog_parameters *params)
+static void tda8290_set_freq(struct tuner *t, unsigned int freq)
 {
-        struct tda8290_priv *priv = fe->tuner_priv;
+        struct tda8290_priv *priv = t->priv;
         unsigned char soft_reset[]  = { 0x00, 0x00 };
         unsigned char easy_mode[]   = { 0x01, priv->tda8290_easy_mode };
         unsigned char expert_mode[] = { 0x01, 0x80 };
@@ -455,10 +139,16 @@ static int tda8290_set_params(struct dvb_frontend *fe,
                       pll_stat;
         int i;
 
-        set_audio(fe, params);
+        struct analog_parameters params = {
+                .frequency = freq,
+                .mode      = t->mode,
+                .audmode   = t->audmode,
+                .std       = t->std
+        };
+
+        set_audio(t);
 
-        if (priv->lna_cfg)
-                tuner_dbg("tda827xa config is 0x%02x\n", *priv->lna_cfg);
+        tuner_dbg("tda827xa config is 0x%02x\n", t->config);
         tuner_i2c_xfer_send(&priv->i2c_props, easy_mode, 2);
         tuner_i2c_xfer_send(&priv->i2c_props, agc_out_on, 2);
         tuner_i2c_xfer_send(&priv->i2c_props, soft_reset, 2);
@@ -474,11 +164,11 @@ static int tda8290_set_params(struct dvb_frontend *fe,
                 tuner_i2c_xfer_send(&priv->i2c_props, adc_head_6, 2);
         tuner_i2c_xfer_send(&priv->i2c_props, pll_bw_nom, 2);
 
-        tda8290_i2c_bridge(fe, 1);
-        if (priv->tda827x_ver != 0)
-                tda827xa_set_analog_params(fe, params);
-        else
-                tda827x_set_analog_params(fe, params);
+        tda8290_i2c_bridge(t, 1);
+
+        if (t->fe.ops.tuner_ops.set_analog_params)
+                t->fe.ops.tuner_ops.set_analog_params(&t->fe, &params);
+
         for (i = 0; i < 3; i++) {
                 tuner_i2c_xfer_send(&priv->i2c_props, &addr_pll_stat, 1);
                 tuner_i2c_xfer_recv(&priv->i2c_props, &pll_stat, 1);
@@ -507,10 +197,8 @@ static int tda8290_set_params(struct dvb_frontend *fe,
                 if ((agc_stat > 115) || !(pll_stat & 0x80)) {
                         tuner_dbg("adjust gain, step 2. Agc: %d, lock: %d\n",
                                    agc_stat, pll_stat & 0x80);
-                        if (priv->tda827x_ver != 0)
-                                tda827xa_agcf(fe);
-                        else
-                                tda827x_agcf(fe);
+                        if (priv->cfg.agcf)
+                                priv->cfg.agcf(&t->fe);
                         msleep(100);
                         tuner_i2c_xfer_send(&priv->i2c_props, &addr_agc_stat, 1);
                         tuner_i2c_xfer_recv(&priv->i2c_props, &agc_stat, 1);
@@ -539,94 +227,61 @@ static int tda8290_set_params(struct dvb_frontend *fe,
                 }
         }
 
-        tda8290_i2c_bridge(fe, 0);
+        tda8290_i2c_bridge(t, 0);
         tuner_i2c_xfer_send(&priv->i2c_props, if_agc_set, 2);
-
-        priv->frequency = (V4L2_TUNER_RADIO == params->mode) ?
-                params->frequency * 125 / 2 : params->frequency * 62500;
-
-        return 0;
 }
 
 /*---------------------------------------------------------------------*/
 
-static int tda8290_has_signal(struct dvb_frontend *fe)
+static int tda8290_has_signal(struct tuner *t)
 {
-        struct tda8290_priv *priv = fe->tuner_priv;
-        int ret;
+        struct tda8290_priv *priv = t->priv;
 
         unsigned char i2c_get_afc[1] = { 0x1B };
         unsigned char afc = 0;
 
-        /* for now, report based on afc status */
         tuner_i2c_xfer_send(&priv->i2c_props, i2c_get_afc, ARRAY_SIZE(i2c_get_afc));
         tuner_i2c_xfer_recv(&priv->i2c_props, &afc, 1);
-
-        ret = (afc & 0x80) ? 65535 : 0;
-
-        tuner_dbg("AFC status: %d\n", ret);
-
-        return ret;
-}
-
-static int tda8290_get_status(struct dvb_frontend *fe, u32 *status)
-{
-        *status = 0;
-
-        if (tda8290_has_signal(fe))
-                *status = TUNER_STATUS_LOCKED;
-
-        return 0;
-}
-
-static int tda8290_get_rf_strength(struct dvb_frontend *fe, u16 *strength)
-{
-        *strength = tda8290_has_signal(fe);
-
-        return 0;
+        return (afc & 0x80)? 65535:0;
 }
 
 /*---------------------------------------------------------------------*/
 
-static int tda8290_standby(struct dvb_frontend *fe)
+static void tda8290_standby(struct tuner *t)
 {
-        struct tda8290_priv *priv = fe->tuner_priv;
+        struct tda8290_priv *priv = t->priv;
         unsigned char cb1[] = { 0x30, 0xD0 };
         unsigned char tda8290_standby[] = { 0x00, 0x02 };
         unsigned char tda8290_agc_tri[] = { 0x02, 0x20 };
         struct i2c_msg msg = {.addr = priv->tda827x_addr, .flags=0, .buf=cb1, .len = 2};
 
-        tda8290_i2c_bridge(fe, 1);
+        tda8290_i2c_bridge(t, 1);
         if (priv->tda827x_ver != 0)
                 cb1[1] = 0x90;
         i2c_transfer(priv->i2c_props.adap, &msg, 1);
-        tda8290_i2c_bridge(fe, 0);
+        tda8290_i2c_bridge(t, 0);
         tuner_i2c_xfer_send(&priv->i2c_props, tda8290_agc_tri, 2);
         tuner_i2c_xfer_send(&priv->i2c_props, tda8290_standby, 2);
-
-        return 0;
 }
 
-
-static void tda8290_init_if(struct dvb_frontend *fe)
+static void tda8290_init_if(struct tuner *t)
 {
-        struct tda8290_priv *priv = fe->tuner_priv;
+        struct tda8290_priv *priv = t->priv;
 
         unsigned char set_VS[] = { 0x30, 0x6F };
         unsigned char set_GP00_CF[] = { 0x20, 0x01 };
         unsigned char set_GP01_CF[] = { 0x20, 0x0B };
 
-        if ((priv->lna_cfg) &&
-            ((*priv->lna_cfg == 1) || (*priv->lna_cfg == 2)))
+        if ((t->config == 1) || (t->config == 2))
                 tuner_i2c_xfer_send(&priv->i2c_props, set_GP00_CF, 2);
         else
                 tuner_i2c_xfer_send(&priv->i2c_props, set_GP01_CF, 2);
         tuner_i2c_xfer_send(&priv->i2c_props, set_VS, 2);
 }
 
-static void tda8290_init_tuner(struct dvb_frontend *fe)
+static void tda8290_init_tuner(struct tuner *t)
 {
-        struct tda8290_priv *priv = fe->tuner_priv;
+        struct tda8290_priv *priv = t->priv;
         unsigned char tda8275_init[]  = { 0x00, 0x00, 0x00, 0x40, 0xdC, 0x04, 0xAf,
                                           0x3F, 0x2A, 0x04, 0xFF, 0x00, 0x00, 0x40 };
         unsigned char tda8275a_init[] = { 0x00, 0x00, 0x00, 0x00, 0xdC, 0x05, 0x8b,
@@ -636,41 +291,31 @@ static void tda8290_init_tuner(struct dvb_frontend *fe)
         if (priv->tda827x_ver != 0)
                 msg.buf = tda8275a_init;
 
-        tda8290_i2c_bridge(fe, 1);
+        tda8290_i2c_bridge(t, 1);
         i2c_transfer(priv->i2c_props.adap, &msg, 1);
-        tda8290_i2c_bridge(fe, 0);
+        tda8290_i2c_bridge(t, 0);
 }
 
 /*---------------------------------------------------------------------*/
 
-static int tda8290_release(struct dvb_frontend *fe)
+static void tda8290_release(struct tuner *t)
 {
-        kfree(fe->tuner_priv);
-        fe->tuner_priv = NULL;
-
-        return 0;
-}
+        if (t->fe.ops.tuner_ops.release)
+                t->fe.ops.tuner_ops.release(&t->fe);
 
-static int tda8290_get_frequency(struct dvb_frontend *fe, u32 *frequency)
-{
-        struct tda8290_priv *priv = fe->tuner_priv;
-        *frequency = priv->frequency;
-        return 0;
+        kfree(t->priv);
+        t->priv = NULL;
 }
 
-static struct dvb_tuner_ops tda8290_tuner_ops = {
-        .sleep             = tda8290_standby,
-        .set_analog_params = tda8290_set_params,
-        .release           = tda8290_release,
-        .get_frequency     = tda8290_get_frequency,
-        .get_status        = tda8290_get_status,
-        .get_rf_strength   = tda8290_get_rf_strength,
+static struct tuner_operations tda8290_tuner_ops = {
+        .set_tv_freq    = tda8290_set_freq,
+        .set_radio_freq = tda8290_set_freq,
+        .has_signal     = tda8290_has_signal,
+        .standby        = tda8290_standby,
+        .release        = tda8290_release,
 };
 
-struct dvb_frontend *tda8290_attach(struct dvb_frontend *fe,
-                                    struct i2c_adapter* i2c_adap,
-                                    u8 i2c_addr,
-                                    struct tda8290_config *cfg)
+int tda8290_attach(struct tuner *t)
 {
         struct tda8290_priv *priv = NULL;
         u8 data;
@@ -680,17 +325,15 @@ struct dvb_frontend *tda8290_attach(struct dvb_frontend *fe,
 
         priv = kzalloc(sizeof(struct tda8290_priv), GFP_KERNEL);
         if (priv == NULL)
-                return NULL;
-        fe->tuner_priv = priv;
-
-        priv->i2c_props.addr = i2c_addr;
-        priv->i2c_props.adap = i2c_adap;
-        if (cfg) {
-                priv->lna_cfg        = cfg->lna_cfg;
-                priv->tuner_callback = cfg->tuner_callback;
-        }
+                return -ENOMEM;
+        t->priv = priv;
+
+        priv->i2c_props.addr     = t->i2c.addr;
+        priv->i2c_props.adap     = t->i2c.adapter;
+        priv->cfg.config         = &t->config;
+        priv->cfg.tuner_callback = t->tuner_callback;
 
-        tda8290_i2c_bridge(fe, 1);
+        tda8290_i2c_bridge(t, 1);
         /* probe for tuner chip */
         tuners_found = 0;
         tuner_addrs = 0;
@@ -706,7 +349,7 @@ struct dvb_frontend *tda8290_attach(struct dvb_frontend *fe,
            behind the bridge and we choose the highest address that doesn't
            give a response now
          */
-        tda8290_i2c_bridge(fe, 0);
+        tda8290_i2c_bridge(t, 0);
         if(tuners_found > 1)
                 for (i = 0; i < tuners_found; i++) {
                         msg.addr = tuner_addrs  & 0xff;
@@ -727,42 +370,45 @@ struct dvb_frontend *tda8290_attach(struct dvb_frontend *fe,
         priv->tda827x_addr = tuner_addrs;
         msg.addr = tuner_addrs;
 
-        tda8290_i2c_bridge(fe, 1);
+        tda8290_i2c_bridge(t, 1);
+
         ret = i2c_transfer(priv->i2c_props.adap, &msg, 1);
         if( ret != 1)
                 tuner_warn("TDA827x access failed!\n");
 
-        memcpy(&fe->ops.tuner_ops, &tda8290_tuner_ops,
-               sizeof(struct dvb_tuner_ops));
-
         if ((data & 0x3c) == 0) {
-                strlcpy(fe->ops.tuner_ops.info.name, "tda8290+75",
-                        sizeof(fe->ops.tuner_ops.info.name));
-                fe->ops.tuner_ops.info.frequency_min  =  55000000;
-                fe->ops.tuner_ops.info.frequency_max  = 860000000;
-                fe->ops.tuner_ops.info.frequency_step =    250000;
+                strlcpy(t->i2c.name, "tda8290+75", sizeof(t->i2c.name));
                 priv->tda827x_ver = 0;
         } else {
-                strlcpy(fe->ops.tuner_ops.info.name, "tda8290+75a",
-                        sizeof(fe->ops.tuner_ops.info.name));
-                fe->ops.tuner_ops.info.frequency_min  =  44000000;
-                fe->ops.tuner_ops.info.frequency_max  = 906000000;
-                fe->ops.tuner_ops.info.frequency_step =     62500;
+                strlcpy(t->i2c.name, "tda8290+75a", sizeof(t->i2c.name));
                 priv->tda827x_ver = 2;
         }
+        tda827x_attach(&t->fe, priv->tda827x_addr,
+                       priv->i2c_props.adap, &priv->cfg);
+
+        /* FIXME: tda827x module doesn't probe the tuner until
+         * tda827x_initial_sleep is called
+         */
+        if (t->fe.ops.tuner_ops.sleep)
+                t->fe.ops.tuner_ops.sleep(&t->fe);
 
-        priv->tda827x_lpsel = 0;
+        memcpy(&t->ops, &tda8290_tuner_ops, sizeof(struct tuner_operations));
 
-        tda8290_init_tuner(fe);
-        tda8290_init_if(fe);
-        return fe;
+        tuner_info("type set to %s\n", t->i2c.name);
+
+        priv->cfg.tda827x_lpsel = 0;
+        t->mode = V4L2_TUNER_ANALOG_TV;
+
+        tda8290_init_tuner(t);
+        tda8290_init_if(t);
+        return 0;
 }
 
-int tda8290_probe(struct i2c_adapter* i2c_adap, u8 i2c_addr)
+int tda8290_probe(struct tuner *t)
 {
         struct tuner_i2c_props i2c_props = {
-                .adap = i2c_adap,
-                .addr = i2c_addr
+                .adap = t->i2c.adapter,
+                .addr = t->i2c.addr
         };
 
         unsigned char soft_reset[]   = { 0x00, 0x00 };
diff --git a/drivers/media/video/tda8290.h b/drivers/media/video/tda8290.h
index 107b24b05aa1..9b63e62b3a0f 100644
--- a/drivers/media/video/tda8290.h
+++ b/drivers/media/video/tda8290.h
@@ -18,36 +18,24 @@
 #define __TDA8290_H__
 
 #include <linux/i2c.h>
-#include "dvb_frontend.h"
-
-struct tda8290_config
-{
-        unsigned int *lna_cfg;
-        int (*tuner_callback) (void *dev, int command,int arg);
-};
+#include "tuner-driver.h"
 
 #if defined(CONFIG_TUNER_TDA8290) || (defined(CONFIG_TUNER_TDA8290_MODULE) && defined(MODULE))
-extern int tda8290_probe(struct i2c_adapter* i2c_adap, u8 i2c_addr);
+extern int tda8290_probe(struct tuner *t);
 
-extern struct dvb_frontend *tda8290_attach(struct dvb_frontend *fe,
-                                           struct i2c_adapter* i2c_adap,
-                                           u8 i2c_addr,
-                                           struct tda8290_config *cfg);
+extern int tda8290_attach(struct tuner *t);
 #else
-static inline int tda8290_probe(struct i2c_adapter* i2c_adap, u8 i2c_addr)
+static inline int tda8290_probe(struct tuner *t)
 {
-        printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n",
-               __FUNCTION__);
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
         return -EINVAL;
 }
 
-static inline struct dvb_frontend *tda8290_attach(struct dvb_frontend *fe,
-                                                  struct i2c_adapter* i2c_adap,
-                                                  u8 i2c_addr,
-                                                  struct tda8290_config *cfg)
+static inline int tda8290_attach(struct tuner *t)
 {
-        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
-        return NULL;
+        printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n",
+               __FUNCTION__);
+        return -EINVAL;
 }
 #endif
 
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 13112732ed2c..99558c708ae7 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -220,15 +220,6 @@ static void tuner_i2c_address_check(struct tuner *t)
         tuner_warn("====================== WARNING! ======================\n");
 }
 
-static void attach_tda8290(struct tuner *t)
-{
-        struct tda8290_config cfg = {
-                .lna_cfg        = &t->config,
-                .tuner_callback = t->tuner_callback
-        };
-        tda8290_attach(&t->fe, t->i2c.adapter, t->i2c.addr, &cfg);
-}
-
 static void attach_simple_tuner(struct tuner *t)
 {
         struct simple_tuner_config cfg = {
@@ -284,7 +275,7 @@ static void set_type(struct i2c_client *c, unsigned int type,
                 break;
         case TUNER_PHILIPS_TDA8290:
         {
-                attach_tda8290(t);
+                tda8290_attach(t);
                 break;
         }
         case TUNER_TEA5767:
@@ -343,7 +334,8 @@ static void set_type(struct i2c_client *c, unsigned int type,
                 break;
         }
 
-        if (fe_tuner_ops->set_analog_params) {
+        if ((fe_tuner_ops->set_analog_params) &&
+            ((NULL == t->ops.set_tv_freq) && (NULL == t->ops.set_radio_freq))) {
                 strlcpy(t->i2c.name, fe_tuner_ops->info.name, sizeof(t->i2c.name));
 
                 t->ops.set_tv_freq    = fe_set_freq;
@@ -624,7 +616,7 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
                 case 0x4b:
                         /* If chip is not tda8290, don't register.
                            since it can be tda9887*/
-                        if (tda8290_probe(t->i2c.adapter, t->i2c.addr) == 0) {
+                        if (tda8290_probe(t) == 0) {
                                 tuner_dbg("chip at addr %x is a tda8290\n", addr);
                         } else {
                                 /* Default is being tda9887 */