Merge git://oss.sgi.com:8090/oss/git/rc-fixes-xfs-2.6
[pandora-kernel.git] / drivers / media / video / saa7134 / saa7134-dvb.c
index 8be6a90..1a536e8 100644 (file)
@@ -1,5 +1,4 @@
 /*
- * $Id: saa7134-dvb.c,v 1.23 2005/07/24 22:12:47 mkrufky Exp $
  *
  * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
  *
 #include <linux/delay.h>
 #include <linux/kthread.h>
 #include <linux/suspend.h>
-#include <linux/config.h>
-
 
 #include "saa7134-reg.h"
 #include "saa7134.h"
+#include <media/v4l2-common.h>
 
 #ifdef HAVE_MT352
 # include "mt352.h"
 #ifdef HAVE_TDA1004X
 # include "tda1004x.h"
 #endif
+#ifdef HAVE_NXT200X
+# include "nxt200x.h"
+# include "dvb-pll.h"
+#endif
 
 MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
 MODULE_LICENSE("GPL");
@@ -153,25 +155,12 @@ static struct mt352_config pinnacle_300i = {
 /* ------------------------------------------------------------------ */
 
 #ifdef HAVE_TDA1004X
-static int philips_tu1216_pll_init(struct dvb_frontend *fe)
-{
-       struct saa7134_dev *dev = fe->dvb->priv;
-       static u8 tu1216_init[] = { 0x0b, 0xf5, 0x85, 0xab };
-       struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tu1216_init,.len = sizeof(tu1216_init) };
-
-       /* setup PLL configuration */
-       if (i2c_transfer(&dev->i2c_adap, &tuner_msg, 1) != 1)
-               return -EIO;
-       msleep(1);
 
-       return 0;
-}
-
-static int philips_tu1216_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
+static int philips_tda6651_pll_set(u8 addr, struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
 {
        struct saa7134_dev *dev = fe->dvb->priv;
        u8 tuner_buf[4];
-       struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tuner_buf,.len =
+       struct i2c_msg tuner_msg = {.addr = addr,.flags = 0,.buf = tuner_buf,.len =
                        sizeof(tuner_buf) };
        int tuner_frequency = 0;
        u8 band, cp, filter;
@@ -244,11 +233,36 @@ static int philips_tu1216_pll_set(struct dvb_frontend *fe, struct dvb_frontend_p
 
        if (i2c_transfer(&dev->i2c_adap, &tuner_msg, 1) != 1)
                return -EIO;
+       msleep(1);
+       return 0;
+}
 
+static int philips_tda6651_pll_init(u8 addr, struct dvb_frontend *fe)
+{
+       struct saa7134_dev *dev = fe->dvb->priv;
+       static u8 tu1216_init[] = { 0x0b, 0xf5, 0x85, 0xab };
+       struct i2c_msg tuner_msg = {.addr = addr,.flags = 0,.buf = tu1216_init,.len = sizeof(tu1216_init) };
+
+       /* setup PLL configuration */
+       if (i2c_transfer(&dev->i2c_adap, &tuner_msg, 1) != 1)
+               return -EIO;
        msleep(1);
+
        return 0;
 }
 
+/* ------------------------------------------------------------------ */
+
+static int philips_tu1216_pll_60_init(struct dvb_frontend *fe)
+{
+       return philips_tda6651_pll_init(0x60, fe);
+}
+
+static int philips_tu1216_pll_60_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
+{
+       return philips_tda6651_pll_set(0x60, fe, params);
+}
+
 static int philips_tu1216_request_firmware(struct dvb_frontend *fe,
                                           const struct firmware **fw, char *name)
 {
@@ -256,22 +270,108 @@ static int philips_tu1216_request_firmware(struct dvb_frontend *fe,
        return request_firmware(fw, name, &dev->pci->dev);
 }
 
-static struct tda1004x_config philips_tu1216_config = {
+static struct tda1004x_config philips_tu1216_60_config = {
+
+       .demod_address = 0x8,
+       .invert        = 1,
+       .invert_oclk   = 0,
+       .xtal_freq     = TDA10046_XTAL_4M,
+       .agc_config    = TDA10046_AGC_DEFAULT,
+       .if_freq       = TDA10046_FREQ_3617,
+       .pll_init      = philips_tu1216_pll_60_init,
+       .pll_set       = philips_tu1216_pll_60_set,
+       .pll_sleep     = NULL,
+       .request_firmware = philips_tu1216_request_firmware,
+};
+
+/* ------------------------------------------------------------------ */
+
+static int philips_tu1216_pll_61_init(struct dvb_frontend *fe)
+{
+       return philips_tda6651_pll_init(0x61, fe);
+}
+
+static int philips_tu1216_pll_61_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
+{
+       return philips_tda6651_pll_set(0x61, fe, params);
+}
+
+static struct tda1004x_config philips_tu1216_61_config = {
 
        .demod_address = 0x8,
        .invert        = 1,
-       .invert_oclk   = 1,
+       .invert_oclk   = 0,
        .xtal_freq     = TDA10046_XTAL_4M,
        .agc_config    = TDA10046_AGC_DEFAULT,
        .if_freq       = TDA10046_FREQ_3617,
-       .pll_init      = philips_tu1216_pll_init,
-       .pll_set       = philips_tu1216_pll_set,
+       .pll_init      = philips_tu1216_pll_61_init,
+       .pll_set       = philips_tu1216_pll_61_set,
        .pll_sleep     = NULL,
        .request_firmware = philips_tu1216_request_firmware,
 };
 
 /* ------------------------------------------------------------------ */
 
+static int philips_europa_pll_init(struct dvb_frontend *fe)
+{
+       struct saa7134_dev *dev = fe->dvb->priv;
+       static u8 msg[] = { 0x0b, 0xf5, 0x86, 0xab };
+       struct i2c_msg init_msg = {.addr = 0x61,.flags = 0,.buf = msg,.len = sizeof(msg) };
+
+       /* setup PLL configuration */
+       if (i2c_transfer(&dev->i2c_adap, &init_msg, 1) != 1)
+               return -EIO;
+       msleep(1);
+
+       /* switch the board to dvb mode */
+       init_msg.addr = 0x43;
+       init_msg.len  = 0x02;
+       msg[0] = 0x00;
+       msg[1] = 0x40;
+       if (i2c_transfer(&dev->i2c_adap, &init_msg, 1) != 1)
+               return -EIO;
+
+       return 0;
+}
+
+static int philips_td1316_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
+{
+       return philips_tda6651_pll_set(0x61, fe, params);
+}
+
+static void philips_europa_analog(struct dvb_frontend *fe)
+{
+       struct saa7134_dev *dev = fe->dvb->priv;
+       /* this message actually turns the tuner back to analog mode */
+       static u8 msg[] = { 0x0b, 0xdc, 0x86, 0xa4 };
+       struct i2c_msg analog_msg = {.addr = 0x61,.flags = 0,.buf = msg,.len = sizeof(msg) };
+
+       i2c_transfer(&dev->i2c_adap, &analog_msg, 1);
+       msleep(1);
+
+       /* switch the board to analog mode */
+       analog_msg.addr = 0x43;
+       analog_msg.len  = 0x02;
+       msg[0] = 0x00;
+       msg[1] = 0x14;
+       i2c_transfer(&dev->i2c_adap, &analog_msg, 1);
+}
+
+static struct tda1004x_config philips_europa_config = {
+
+       .demod_address = 0x8,
+       .invert        = 0,
+       .invert_oclk   = 0,
+       .xtal_freq     = TDA10046_XTAL_4M,
+       .agc_config    = TDA10046_AGC_IFO_AUTO_POS,
+       .if_freq       = TDA10046_FREQ_052,
+       .pll_init      = philips_europa_pll_init,
+       .pll_set       = philips_td1316_pll_set,
+       .pll_sleep     = philips_europa_analog,
+       .request_firmware = NULL,
+};
+
+/* ------------------------------------------------------------------ */
 
 static int philips_fmd1216_pll_init(struct dvb_frontend *fe)
 {
@@ -384,7 +484,6 @@ static int philips_fmd1216_pll_set(struct dvb_frontend *fe, struct dvb_frontend_
        return 0;
 }
 
-#ifdef HAVE_TDA1004X
 static struct tda1004x_config medion_cardbus = {
        .demod_address = 0x08,
        .invert        = 1,
@@ -397,7 +496,6 @@ static struct tda1004x_config medion_cardbus = {
        .pll_sleep         = philips_fmd1216_analog,
        .request_firmware = NULL,
 };
-#endif
 
 /* ------------------------------------------------------------------ */
 
@@ -454,7 +552,7 @@ static int philips_tda827x_pll_set(struct dvb_frontend *fe, struct dvb_frontend_
        u8 tuner_buf[14];
 
        struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tuner_buf,
-                                       .len = sizeof(tuner_buf) };
+                                       .len = sizeof(tuner_buf) };
        int i, tuner_freq, if_freq;
        u32 N;
        switch (params->u.ofdm.bandwidth) {
@@ -513,7 +611,7 @@ static void philips_tda827x_pll_sleep(struct dvb_frontend *fe)
        struct saa7134_dev *dev = fe->dvb->priv;
        static u8 tda827x_sleep[] = { 0x30, 0xd0};
        struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tda827x_sleep,
-                                   .len = sizeof(tda827x_sleep) };
+                                   .len = sizeof(tda827x_sleep) };
        i2c_transfer(&dev->i2c_adap, &tuner_msg, 1);
 }
 
@@ -529,6 +627,202 @@ static struct tda1004x_config tda827x_lifeview_config = {
        .pll_sleep         = philips_tda827x_pll_sleep,
        .request_firmware = NULL,
 };
+
+/* ------------------------------------------------------------------ */
+
+struct tda827xa_data {
+       u32 lomax;
+       u8  svco;
+       u8  spd;
+       u8  scr;
+       u8  sbs;
+       u8  gc3;
+};
+
+static struct tda827xa_data tda827xa_dvbt[] = {
+       { .lomax =  56875000, .svco = 3, .spd = 4, .scr = 0, .sbs = 0, .gc3 = 1},
+       { .lomax =  67250000, .svco = 0, .spd = 3, .scr = 0, .sbs = 0, .gc3 = 1},
+       { .lomax =  81250000, .svco = 1, .spd = 3, .scr = 0, .sbs = 0, .gc3 = 1},
+       { .lomax =  97500000, .svco = 2, .spd = 3, .scr = 0, .sbs = 0, .gc3 = 1},
+       { .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 = 1},
+       { .lomax = 269000000, .svco = 0, .spd = 1, .scr = 0, .sbs = 2, .gc3 = 1},
+       { .lomax = 290000000, .svco = 1, .spd = 1, .scr = 0, .sbs = 2, .gc3 = 1},
+       { .lomax = 325000000, .svco = 1, .spd = 1, .scr = 0, .sbs = 3, .gc3 = 1},
+       { .lomax = 390000000, .svco = 2, .spd = 1, .scr = 0, .sbs = 3, .gc3 = 1},
+       { .lomax = 455000000, .svco = 3, .spd = 1, .scr = 0, .sbs = 3, .gc3 = 1},
+       { .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 = 550000000, .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 philips_tda827xa_pll_set(u8 addr, struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
+{
+       struct saa7134_dev *dev = fe->dvb->priv;
+       u8 tuner_buf[14];
+       unsigned char reg2[2];
+
+       struct i2c_msg msg = {.addr = addr,.flags = 0,.buf = tuner_buf};
+       int i, tuner_freq, if_freq;
+       u32 N;
+
+       switch (params->u.ofdm.bandwidth) {
+       case BANDWIDTH_6_MHZ:
+               if_freq = 4000000;
+               break;
+       case BANDWIDTH_7_MHZ:
+               if_freq = 4500000;
+               break;
+       default:                   /* 8 MHz or Auto */
+               if_freq = 5000000;
+               break;
+       }
+       tuner_freq = params->frequency + if_freq;
+
+       i = 0;
+       while (tda827xa_dvbt[i].lomax < tuner_freq) {
+               if(tda827xa_dvbt[i + 1].lomax == 0)
+                       break;
+               i++;
+       }
+
+       N = ((tuner_freq + 31250) / 62500) << tda827xa_dvbt[i].spd;
+       tuner_buf[0] = 0;            // subaddress
+       tuner_buf[1] = N >> 8;
+       tuner_buf[2] = N & 0xff;
+       tuner_buf[3] = 0;
+       tuner_buf[4] = 0x16;
+       tuner_buf[5] = (tda827xa_dvbt[i].spd << 5) + (tda827xa_dvbt[i].svco << 3) +
+                       tda827xa_dvbt[i].sbs;
+       tuner_buf[6] = 0x4b + (tda827xa_dvbt[i].gc3 << 4);
+       tuner_buf[7] = 0x0c;
+       tuner_buf[8] = 0x06;
+       tuner_buf[9] = 0x24;
+       tuner_buf[10] = 0xff;
+       tuner_buf[11] = 0x60;
+       tuner_buf[12] = 0x00;
+       tuner_buf[13] = 0x39;  // lpsel
+       msg.len = 14;
+       if (i2c_transfer(&dev->i2c_adap, &msg, 1) != 1)
+               return -EIO;
+
+       msg.buf= reg2;
+       msg.len = 2;
+       reg2[0] = 0x60;
+       reg2[1] = 0x3c;
+       i2c_transfer(&dev->i2c_adap, &msg, 1);
+
+       reg2[0] = 0xa0;
+       reg2[1] = 0x40;
+       i2c_transfer(&dev->i2c_adap, &msg, 1);
+
+       msleep(2);
+       /* correct CP value */
+       reg2[0] = 0x30;
+       reg2[1] = 0x10 + tda827xa_dvbt[i].scr;
+       msg.len = 2;
+       i2c_transfer(&dev->i2c_adap, &msg, 1);
+
+       msleep(550);
+       reg2[0] = 0x50;
+       reg2[1] = 0x4f + (tda827xa_dvbt[i].gc3 << 4);
+       i2c_transfer(&dev->i2c_adap, &msg, 1);
+
+       return 0;
+
+}
+
+static void philips_tda827xa_pll_sleep(u8 addr, struct dvb_frontend *fe)
+{
+       struct saa7134_dev *dev = fe->dvb->priv;
+       static u8 tda827xa_sleep[] = { 0x30, 0x90};
+       struct i2c_msg tuner_msg = {.addr = addr,.flags = 0,.buf = tda827xa_sleep,
+                                   .len = sizeof(tda827xa_sleep) };
+       i2c_transfer(&dev->i2c_adap, &tuner_msg, 1);
+
+}
+
+/* ------------------------------------------------------------------ */
+
+static int philips_tiger_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
+{
+       int ret;
+       struct saa7134_dev *dev = fe->dvb->priv;
+       static u8 tda8290_close[] = { 0x21, 0xc0};
+       static u8 tda8290_open[]  = { 0x21, 0x80};
+       struct i2c_msg tda8290_msg = {.addr = 0x4b,.flags = 0, .len = 2};
+       /* close tda8290 i2c bridge */
+       tda8290_msg.buf = tda8290_close;
+       ret = i2c_transfer(&dev->i2c_adap, &tda8290_msg, 1);
+       if (ret != 1)
+               return -EIO;
+       msleep(20);
+       ret = philips_tda827xa_pll_set(0x61, fe, params);
+       if (ret != 0)
+               return ret;
+       /* open tda8290 i2c bridge */
+       tda8290_msg.buf = tda8290_open;
+       i2c_transfer(&dev->i2c_adap, &tda8290_msg, 1);
+       return ret;
+};
+
+static int philips_tiger_dvb_mode(struct dvb_frontend *fe)
+{
+       struct saa7134_dev *dev = fe->dvb->priv;
+       static u8 data[] = { 0x3c, 0x33, 0x6a};
+       struct i2c_msg msg = {.addr=0x08, .flags=0, .buf=data, .len = sizeof(data)};
+
+       if (i2c_transfer(&dev->i2c_adap, &msg, 1) != 1)
+               return -EIO;
+       return 0;
+}
+
+static void philips_tiger_analog_mode(struct dvb_frontend *fe)
+{
+       struct saa7134_dev *dev = fe->dvb->priv;
+       static u8 data[] = { 0x3c, 0x33, 0x68};
+       struct i2c_msg msg = {.addr=0x08, .flags=0, .buf=data, .len = sizeof(data)};
+
+       i2c_transfer(&dev->i2c_adap, &msg, 1);
+       philips_tda827xa_pll_sleep( 0x61, fe);
+}
+
+static struct tda1004x_config philips_tiger_config = {
+       .demod_address = 0x08,
+       .invert        = 1,
+       .invert_oclk   = 0,
+       .xtal_freq     = TDA10046_XTAL_16M,
+       .agc_config    = TDA10046_AGC_TDA827X,
+       .if_freq       = TDA10046_FREQ_045,
+       .pll_init      = philips_tiger_dvb_mode,
+       .pll_set       = philips_tiger_pll_set,
+       .pll_sleep     = philips_tiger_analog_mode,
+       .request_firmware = NULL,
+};
+
+#endif
+
+/* ------------------------------------------------------------------ */
+
+#ifdef HAVE_NXT200X
+static struct nxt200x_config avertvhda180 = {
+       .demod_address    = 0x0a,
+       .pll_address      = 0x61,
+       .pll_desc         = &dvb_pll_tdhu2,
+};
 #endif
 
 /* ------------------------------------------------------------------ */
@@ -560,17 +854,42 @@ static int dvb_init(struct saa7134_dev *dev)
                                                    &dev->i2c_adap);
                break;
        case SAA7134_BOARD_PHILIPS_TOUGH:
-               dev->dvb.frontend = tda10046_attach(&philips_tu1216_config,
+               dev->dvb.frontend = tda10046_attach(&philips_tu1216_60_config,
                                                    &dev->i2c_adap);
                break;
        case SAA7134_BOARD_FLYDVBTDUO:
                dev->dvb.frontend = tda10046_attach(&tda827x_lifeview_config,
                                                    &dev->i2c_adap);
                break;
-       case SAA7134_BOARD_THYPHOON_DVBT_DUO_CARDBUS:
+       case SAA7134_BOARD_FLYDVBT_DUO_CARDBUS:
                dev->dvb.frontend = tda10046_attach(&tda827x_lifeview_config,
                                                    &dev->i2c_adap);
                break;
+       case SAA7134_BOARD_PHILIPS_EUROPA:
+               dev->dvb.frontend = tda10046_attach(&philips_europa_config,
+                                                   &dev->i2c_adap);
+               break;
+       case SAA7134_BOARD_VIDEOMATE_DVBT_300:
+               dev->dvb.frontend = tda10046_attach(&philips_europa_config,
+                                                   &dev->i2c_adap);
+               break;
+       case SAA7134_BOARD_VIDEOMATE_DVBT_200:
+               dev->dvb.frontend = tda10046_attach(&philips_tu1216_61_config,
+                                                   &dev->i2c_adap);
+               break;
+       case SAA7134_BOARD_PHILIPS_TIGER:
+               dev->dvb.frontend = tda10046_attach(&philips_tiger_config,
+                                                   &dev->i2c_adap);
+               break;
+       case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
+               dev->dvb.frontend = tda10046_attach(&philips_tiger_config,
+                                                   &dev->i2c_adap);
+               break;
+#endif
+#ifdef HAVE_NXT200X
+       case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180:
+               dev->dvb.frontend = nxt200x_attach(&avertvhda180, &dev->i2c_adap);
+               break;
 #endif
        default:
                printk("%s: Huh? unknown DVB card?\n",dev->name);