summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Endriss2010-03-10 16:46:46 +0100
committerMauro Carvalho Chehab2010-05-18 05:46:52 +0200
commitc4ea13b40bc962245a38148dc5e7633fd8428880 (patch)
treebef6650dffe9e27f37d10f50acfb2c49fddcc9f5
parentV4L/DVB: drivers/media: drop redundant memset (diff)
downloadkernel-qcow2-linux-c4ea13b40bc962245a38148dc5e7633fd8428880.tar.gz
kernel-qcow2-linux-c4ea13b40bc962245a38148dc5e7633fd8428880.tar.xz
kernel-qcow2-linux-c4ea13b40bc962245a38148dc5e7633fd8428880.zip
V4L/DVB: ngene: Add support for cineS2 v5 and SaTiX-S2 Dual v2
Add support for - Linux4Media cineS2 DVB-S2 Twin Tuner (v5) - Mystique SaTiX-S2 Dual (v2) Signed-off-by: Oliver Endriss <o.endriss@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb/ngene/ngene-core.c32
1 files changed, 30 insertions, 2 deletions
diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/dvb/ngene/ngene-core.c
index 52f60d448de0..a45e53a65462 100644
--- a/drivers/media/dvb/ngene/ngene-core.c
+++ b/drivers/media/dvb/ngene/ngene-core.c
@@ -1920,7 +1920,7 @@ static struct ngene_info ngene_info_cineS2 = {
.fw_version = 15,
};
-static struct ngene_info ngene_info_satixs2 = {
+static struct ngene_info ngene_info_satixS2 = {
.type = NGENE_SIDEWINDER,
.name = "Mystique SaTiX-S2 Dual",
.io_type = {NGENE_IO_TSIN, NGENE_IO_TSIN},
@@ -1933,6 +1933,32 @@ static struct ngene_info ngene_info_satixs2 = {
.fw_version = 15,
};
+static struct ngene_info ngene_info_satixS2v2 = {
+ .type = NGENE_SIDEWINDER,
+ .name = "Mystique SaTiX-S2 Dual (v2)",
+ .io_type = {NGENE_IO_TSIN, NGENE_IO_TSIN},
+ .demod_attach = {demod_attach_stv0900, demod_attach_stv0900},
+ .tuner_attach = {tuner_attach_stv6110, tuner_attach_stv6110},
+ .fe_config = {&fe_cineS2, &fe_cineS2},
+ .tuner_config = {&tuner_cineS2_0, &tuner_cineS2_1},
+ .lnb = {0x0a, 0x08},
+ .tsf = {3, 3},
+ .fw_version = 15,
+};
+
+static struct ngene_info ngene_info_cineS2v5 = {
+ .type = NGENE_SIDEWINDER,
+ .name = "Linux4Media cineS2 DVB-S2 Twin Tuner (v5)",
+ .io_type = {NGENE_IO_TSIN, NGENE_IO_TSIN},
+ .demod_attach = {demod_attach_stv0900, demod_attach_stv0900},
+ .tuner_attach = {tuner_attach_stv6110, tuner_attach_stv6110},
+ .fe_config = {&fe_cineS2, &fe_cineS2},
+ .tuner_config = {&tuner_cineS2_0, &tuner_cineS2_1},
+ .lnb = {0x0a, 0x08},
+ .tsf = {3, 3},
+ .fw_version = 15,
+};
+
/****************************************************************************/
@@ -1951,7 +1977,9 @@ static struct ngene_info ngene_info_satixs2 = {
static const struct pci_device_id ngene_id_tbl[] __devinitdata = {
NGENE_ID(0x18c3, 0xabc3, ngene_info_cineS2),
NGENE_ID(0x18c3, 0xabc4, ngene_info_cineS2),
- NGENE_ID(0x18c3, 0xdb01, ngene_info_satixs2),
+ NGENE_ID(0x18c3, 0xdb01, ngene_info_satixS2),
+ NGENE_ID(0x18c3, 0xdb02, ngene_info_satixS2v2),
+ NGENE_ID(0x18c3, 0xdd00, ngene_info_cineS2v5),
{0}
};
MODULE_DEVICE_TABLE(pci, ngene_id_tbl);