[PATCH] v4l: 656: added support for the following cards

- Added support for the following cards:
- Philips EUROPA reference desigh
- Compro VideoMate DVB-T300
- Compro VideoMate DVB-T200 (initial)

Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t.online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 130 insertions, 22 deletions

diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 639ae51a052d..f8e01030fbc7 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -151,25 +151,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;
@@ -242,11 +229,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)
 {
@@ -254,22 +266,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   = 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_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   = 0,
+        .xtal_freq     = TDA10046_XTAL_4M,
+        .agc_config    = TDA10046_AGC_DEFAULT,
+        .if_freq       = TDA10046_FREQ_3617,
+        .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)
 {
@@ -382,7 +480,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,
@@ -395,7 +492,6 @@ static struct tda1004x_config medion_cardbus = {
         .pll_sleep         = philips_fmd1216_analog,
         .request_firmware = NULL,
 };
-#endif
 
 /* ------------------------------------------------------------------ */
 
@@ -558,7 +654,7 @@ 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:
@@ -569,6 +665,18 @@ static int dvb_init(struct saa7134_dev *dev)
                 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;
 #endif
         default:
                 printk("%s: Huh? unknown DVB card?\n",dev->name);