aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88/cx88-cards.c
diff options
context:
space:
mode:
authorStephan Wienczny <Stephan@wienczny.de>2009-03-10 18:08:06 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:43:18 -0400
commit70101a2785598f1a743c1e0fb65264c55bf5a29f (patch)
tree043fa173cb83eda02b3fc09f1e76b9c0d626cc94 /drivers/media/video/cx88/cx88-cards.c
parenta27e4fd321cdfe5b333efb41589c1008c705e312 (diff)
V4L/DVB (10949): Add support for Terratec Cinergy HT PCI MKII
This patch adds support for Terratec Cinergy HT PCI MKII with card id 79. Its more or less a copy of Pinnacle Hybrid PCTV. Thanks to k1ngf1sher on forum.ubuntuusers.de for the idea to copy that card. Signed-off-by: Stephan Wienczny <stephan@wienczny.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx88/cx88-cards.c')
-rw-r--r--drivers/media/video/cx88/cx88-cards.c38
1 files changed, 38 insertions, 0 deletions
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 733ede34f93a..1d7e3a562995 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1934,6 +1934,39 @@ static const struct cx88_board cx88_boards[] = {
1934 } }, 1934 } },
1935 .mpeg = CX88_MPEG_DVB, 1935 .mpeg = CX88_MPEG_DVB,
1936 }, 1936 },
1937 [CX88_BOARD_TERRATEC_CINERGY_HT_PCI_MKII] = {
1938 .name = "Terratec Cinergy HT PCI MKII",
1939 .tuner_type = TUNER_XC2028,
1940 .tuner_addr = 0x61,
1941 .radio_type = TUNER_XC2028,
1942 .radio_addr = 0x61,
1943 .input = { {
1944 .type = CX88_VMUX_TELEVISION,
1945 .vmux = 0,
1946 .gpio0 = 0x004ff,
1947 .gpio1 = 0x010ff,
1948 .gpio2 = 0x00001,
1949 }, {
1950 .type = CX88_VMUX_COMPOSITE1,
1951 .vmux = 1,
1952 .gpio0 = 0x004fb,
1953 .gpio1 = 0x010ef,
1954 .audioroute = 1,
1955 }, {
1956 .type = CX88_VMUX_SVIDEO,
1957 .vmux = 2,
1958 .gpio0 = 0x004fb,
1959 .gpio1 = 0x010ef,
1960 .audioroute = 1,
1961 } },
1962 .radio = {
1963 .type = CX88_RADIO,
1964 .gpio0 = 0x004ff,
1965 .gpio1 = 0x010ff,
1966 .gpio2 = 0x0ff,
1967 },
1968 .mpeg = CX88_MPEG_DVB,
1969 },
1937}; 1970};
1938 1971
1939/* ------------------------------------------------------------------ */ 1972/* ------------------------------------------------------------------ */
@@ -2343,6 +2376,10 @@ static const struct cx88_subid cx88_subids[] = {
2343 .subvendor = 0xb200, 2376 .subvendor = 0xb200,
2344 .subdevice = 0x4200, 2377 .subdevice = 0x4200,
2345 .card = CX88_BOARD_SATTRADE_ST4200, 2378 .card = CX88_BOARD_SATTRADE_ST4200,
2379 }, {
2380 .subvendor = 0x153b,
2381 .subdevice = 0x1177,
2382 .card = CX88_BOARD_TERRATEC_CINERGY_HT_PCI_MKII,
2346 }, 2383 },
2347}; 2384};
2348 2385
@@ -2819,6 +2856,7 @@ void cx88_setup_xc3028(struct cx88_core *core, struct xc2028_ctrl *ctl)
2819 */ 2856 */
2820 break; 2857 break;
2821 case CX88_BOARD_PINNACLE_HYBRID_PCTV: 2858 case CX88_BOARD_PINNACLE_HYBRID_PCTV:
2859 case CX88_BOARD_TERRATEC_CINERGY_HT_PCI_MKII:
2822 ctl->demod = XC3028_FE_ZARLINK456; 2860 ctl->demod = XC3028_FE_ZARLINK456;
2823 ctl->mts = 1; 2861 ctl->mts = 1;
2824 break; 2862 break;