6 files changed, 42 insertions, 14 deletions

diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index e2062b240e32..0f9fb99adeb4 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -4951,8 +4951,9 @@ struct saa7134_board saa7134_boards[] = {
                 .audio_clock    = 0x00187de7,
                 .tuner_type     = TUNER_XC2028,
                 .radio_type     = UNSET,
-                .tuner_addr     = ADDR_UNSET,
+                .tuner_addr     = 0x61,
                 .radio_addr     = ADDR_UNSET,
+                .mpeg           = SAA7134_MPEG_DVB,
                 .inputs = {{
                         .name   = name_tv,
                         .vmux   = 3,
@@ -6992,6 +6993,11 @@ static int saa7134_xc2028_callback(struct saa7134_dev *dev,
                         msleep(10);
                         saa7134_set_gpio(dev, 18, 1);
                 break;
+                case SAA7134_BOARD_VIDEOMATE_T750:
+                        saa7134_set_gpio(dev, 20, 0);
+                        msleep(10);
+                        saa7134_set_gpio(dev, 20, 1);
+                break;
                 }
         return 0;
         }
@@ -7451,6 +7457,11 @@ int saa7134_board_init1(struct saa7134_dev *dev)
                 saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   0x0e050000, 0x0c050000);
                 saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x0e050000, 0x0c050000);
                 break;
+        case SAA7134_BOARD_VIDEOMATE_T750:
+                /* enable the analog tuner */
+                saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   0x00008000, 0x00008000);
+                saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x00008000, 0x00008000);
+                break;
         }
         return 0;
 }
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index f9be737ba6f4..ca65cda3e101 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -39,6 +39,8 @@
 MODULE_DESCRIPTION("v4l2 driver module for saa7130/34 based TV cards");
 MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(SAA7134_VERSION);
+
 
 /* ------------------------------------------------------------------ */
 
@@ -1332,14 +1334,8 @@ static struct pci_driver saa7134_pci_driver = {
 static int __init saa7134_init(void)
 {
         INIT_LIST_HEAD(&saa7134_devlist);
-        printk(KERN_INFO "saa7130/34: v4l2 driver version %d.%d.%d loaded\n",
-               (SAA7134_VERSION_CODE >> 16) & 0xff,
-               (SAA7134_VERSION_CODE >>  8) & 0xff,
-               SAA7134_VERSION_CODE & 0xff);
-#ifdef SNAPSHOT
-        printk(KERN_INFO "saa7130/34: snapshot date %04d-%02d-%02d\n",
-               SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100);
-#endif
+        printk(KERN_INFO "saa7130/34: v4l2 driver version %s loaded\n",
+               SAA7134_VERSION);
         return pci_register_driver(&saa7134_pci_driver);
 }
 
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 996a206c6d79..1e4ef1669887 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -56,6 +56,7 @@
 #include "lgs8gxx.h"
 
 #include "zl10353.h"
+#include "qt1010.h"
 
 #include "zl10036.h"
 #include "zl10039.h"
@@ -939,6 +940,18 @@ static struct zl10353_config behold_x7_config = {
         .disable_i2c_gate_ctrl = 1,
 };
 
+static struct zl10353_config videomate_t750_zl10353_config = {
+        .demod_address         = 0x0f,
+        .no_tuner              = 1,
+        .parallel_ts           = 1,
+        .disable_i2c_gate_ctrl = 1,
+};
+
+static struct qt1010_config videomate_t750_qt1010_config = {
+        .i2c_address = 0x62
+};
+
+
 /* ==================================================================
  * tda10086 based DVB-S cards, helper functions
  */
@@ -1650,6 +1663,18 @@ static int dvb_init(struct saa7134_dev *dev)
                                         __func__);
 
                 break;
+        case SAA7134_BOARD_VIDEOMATE_T750:
+                fe0->dvb.frontend = dvb_attach(zl10353_attach,
+                                                &videomate_t750_zl10353_config,
+                                                &dev->i2c_adap);
+                if (fe0->dvb.frontend != NULL) {
+                        if (dvb_attach(qt1010_attach,
+                                        fe0->dvb.frontend,
+                                        &dev->i2c_adap,
+                                        &videomate_t750_qt1010_config) == NULL)
+                                wprintk("error attaching QT1010\n");
+                }
+                break;
         case SAA7134_BOARD_ZOLID_HYBRID_PCI:
                 fe0->dvb.frontend = dvb_attach(tda10048_attach,
                                                &zolid_tda10048_config,
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index 18294db38a01..dde361a9194e 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -172,7 +172,6 @@ static int empress_querycap(struct file *file, void  *priv,
         strlcpy(cap->card, saa7134_boards[dev->board].name,
                 sizeof(cap->card));
         sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
-        cap->version = SAA7134_VERSION_CODE;
         cap->capabilities =
                 V4L2_CAP_VIDEO_CAPTURE |
                 V4L2_CAP_READWRITE |
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 776ba2dd7f9f..9cf7914f6f90 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -1810,7 +1810,6 @@ static int saa7134_querycap(struct file *file, void  *priv,
         strlcpy(cap->card, saa7134_boards[dev->board].name,
                 sizeof(cap->card));
         sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
-        cap->version = SAA7134_VERSION_CODE;
         cap->capabilities =
                 V4L2_CAP_VIDEO_CAPTURE |
                 V4L2_CAP_VBI_CAPTURE |
@@ -2307,7 +2306,6 @@ static int radio_querycap(struct file *file, void *priv,
         strcpy(cap->driver, "saa7134");
         strlcpy(cap->card, saa7134_boards[dev->board].name, sizeof(cap->card));
         sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
-        cap->version = SAA7134_VERSION_CODE;
         cap->capabilities = V4L2_CAP_TUNER;
         return 0;
 }
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 28eb10398323..bc8d6bba8ee5 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -19,8 +19,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/version.h>
-#define SAA7134_VERSION_CODE KERNEL_VERSION(0, 2, 16)
+#define SAA7134_VERSION "0, 2, 17"
 
 #include <linux/pci.h>
 #include <linux/i2c.h>