aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
diff options
context:
space:
mode:
authorOliver Endriss <o.endriss@gmx.de>2010-03-10 10:46:46 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-17 23:46:52 -0400
commitc4ea13b40bc962245a38148dc5e7633fd8428880 (patch)
treebef6650dffe9e27f37d10f50acfb2c49fddcc9f5 /drivers/media/dvb
parent5ce005002cd30a71f4355bd4fa8884154d6bd1ad (diff)
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>
Diffstat (limited to 'drivers/media/dvb')
-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 = {
1920 .fw_version = 15, 1920 .fw_version = 15,
1921}; 1921};
1922 1922
1923static struct ngene_info ngene_info_satixs2 = { 1923static struct ngene_info ngene_info_satixS2 = {
1924 .type = NGENE_SIDEWINDER, 1924 .type = NGENE_SIDEWINDER,
1925 .name = "Mystique SaTiX-S2 Dual", 1925 .name = "Mystique SaTiX-S2 Dual",
1926 .io_type = {NGENE_IO_TSIN, NGENE_IO_TSIN}, 1926 .io_type = {NGENE_IO_TSIN, NGENE_IO_TSIN},
@@ -1933,6 +1933,32 @@ static struct ngene_info ngene_info_satixs2 = {
1933 .fw_version = 15, 1933 .fw_version = 15,
1934}; 1934};
1935 1935
1936static struct ngene_info ngene_info_satixS2v2 = {
1937 .type = NGENE_SIDEWINDER,
1938 .name = "Mystique SaTiX-S2 Dual (v2)",
1939 .io_type = {NGENE_IO_TSIN, NGENE_IO_TSIN},
1940 .demod_attach = {demod_attach_stv0900, demod_attach_stv0900},
1941 .tuner_attach = {tuner_attach_stv6110, tuner_attach_stv6110},
1942 .fe_config = {&fe_cineS2, &fe_cineS2},
1943 .tuner_config = {&tuner_cineS2_0, &tuner_cineS2_1},
1944 .lnb = {0x0a, 0x08},
1945 .tsf = {3, 3},
1946 .fw_version = 15,
1947};
1948
1949static struct ngene_info ngene_info_cineS2v5 = {
1950 .type = NGENE_SIDEWINDER,
1951 .name = "Linux4Media cineS2 DVB-S2 Twin Tuner (v5)",
1952 .io_type = {NGENE_IO_TSIN, NGENE_IO_TSIN},
1953 .demod_attach = {demod_attach_stv0900, demod_attach_stv0900},
1954 .tuner_attach = {tuner_attach_stv6110, tuner_attach_stv6110},
1955 .fe_config = {&fe_cineS2, &fe_cineS2},
1956 .tuner_config = {&tuner_cineS2_0, &tuner_cineS2_1},
1957 .lnb = {0x0a, 0x08},
1958 .tsf = {3, 3},
1959 .fw_version = 15,
1960};
1961
1936/****************************************************************************/ 1962/****************************************************************************/
1937 1963
1938 1964
@@ -1951,7 +1977,9 @@ static struct ngene_info ngene_info_satixs2 = {
1951static const struct pci_device_id ngene_id_tbl[] __devinitdata = { 1977static const struct pci_device_id ngene_id_tbl[] __devinitdata = {
1952 NGENE_ID(0x18c3, 0xabc3, ngene_info_cineS2), 1978 NGENE_ID(0x18c3, 0xabc3, ngene_info_cineS2),
1953 NGENE_ID(0x18c3, 0xabc4, ngene_info_cineS2), 1979 NGENE_ID(0x18c3, 0xabc4, ngene_info_cineS2),
1954 NGENE_ID(0x18c3, 0xdb01, ngene_info_satixs2), 1980 NGENE_ID(0x18c3, 0xdb01, ngene_info_satixS2),
1981 NGENE_ID(0x18c3, 0xdb02, ngene_info_satixS2v2),
1982 NGENE_ID(0x18c3, 0xdd00, ngene_info_cineS2v5),
1955 {0} 1983 {0}
1956}; 1984};
1957MODULE_DEVICE_TABLE(pci, ngene_id_tbl); 1985MODULE_DEVICE_TABLE(pci, ngene_id_tbl);