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>

1 files changed, 293 insertions, 14 deletions

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>");