aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor M. Liplianin <liplianin@me.by>2008-11-09 13:26:25 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-29 14:53:28 -0500
commitcd3cde1271c6c597c16e4c22810449949c675092 (patch)
tree70dbe4a80706d7173219b5b475be2205f6eccd90
parent4b29631db33292d416dc395c56122ea865e7635c (diff)
V4L/DVB (9534): cx88: Add support for Prof 6200 DVB-S PCI card
The card based on stv0299 or stv0288 demodulators. Signed-off-by: Igor M. Liplianin <liplianin@me.by> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--Documentation/video4linux/CARDLIST.cx881
-rw-r--r--drivers/media/video/cx88/cx88-cards.c17
-rw-r--r--drivers/media/video/cx88/cx88-dvb.c1
-rw-r--r--drivers/media/video/cx88/cx88.h1
4 files changed, 20 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88
index dc8da94061ac..0d08f1edcf6d 100644
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
@@ -76,3 +76,4 @@
76 75 -> PROF 7300 DVB-S/S2 [B033:3033] 76 75 -> PROF 7300 DVB-S/S2 [B033:3033]
77 76 -> SATTRADE ST4200 DVB-S/S2 [b200:4200] 77 76 -> SATTRADE ST4200 DVB-S/S2 [b200:4200]
78 77 -> TBS 8910 DVB-S [8910:8888] 78 77 -> TBS 8910 DVB-S [8910:8888]
79 78 -> Prof 6200 DVB-S [b022:3022]
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index bbe5b3343ac3..38bf5ee4d4a7 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1871,6 +1871,18 @@ static const struct cx88_board cx88_boards[] = {
1871 } }, 1871 } },
1872 .mpeg = CX88_MPEG_DVB, 1872 .mpeg = CX88_MPEG_DVB,
1873 }, 1873 },
1874 [CX88_BOARD_PROF_6200] = {
1875 .name = "Prof 6200 DVB-S",
1876 .tuner_type = UNSET,
1877 .radio_type = UNSET,
1878 .tuner_addr = ADDR_UNSET,
1879 .radio_addr = ADDR_UNSET,
1880 .input = {{
1881 .type = CX88_VMUX_DVB,
1882 .vmux = 0,
1883 } },
1884 .mpeg = CX88_MPEG_DVB,
1885 },
1874 [CX88_BOARD_PROF_7300] = { 1886 [CX88_BOARD_PROF_7300] = {
1875 .name = "PROF 7300 DVB-S/S2", 1887 .name = "PROF 7300 DVB-S/S2",
1876 .tuner_type = UNSET, 1888 .tuner_type = UNSET,
@@ -2293,6 +2305,10 @@ static const struct cx88_subid cx88_subids[] = {
2293 .subdevice = 0x8888, 2305 .subdevice = 0x8888,
2294 .card = CX88_BOARD_TBS_8920, 2306 .card = CX88_BOARD_TBS_8920,
2295 }, { 2307 }, {
2308 .subvendor = 0xb022,
2309 .subdevice = 0x3022,
2310 .card = CX88_BOARD_PROF_6200,
2311 }, {
2296 .subvendor = 0xB033, 2312 .subvendor = 0xB033,
2297 .subdevice = 0x3033, 2313 .subdevice = 0x3033,
2298 .card = CX88_BOARD_PROF_7300, 2314 .card = CX88_BOARD_PROF_7300,
@@ -2912,6 +2928,7 @@ static void cx88_card_setup(struct cx88_core *core)
2912 case CX88_BOARD_OMICOM_SS4_PCI: 2928 case CX88_BOARD_OMICOM_SS4_PCI:
2913 case CX88_BOARD_TBS_8910: 2929 case CX88_BOARD_TBS_8910:
2914 case CX88_BOARD_TBS_8920: 2930 case CX88_BOARD_TBS_8920:
2931 case CX88_BOARD_PROF_6200:
2915 case CX88_BOARD_PROF_7300: 2932 case CX88_BOARD_PROF_7300:
2916 case CX88_BOARD_SATTRADE_ST4200: 2933 case CX88_BOARD_SATTRADE_ST4200:
2917 cx_write(MO_SRST_IO, 0); 2934 cx_write(MO_SRST_IO, 0);
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index bab28112e40e..3c328a2f28fb 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -1042,6 +1042,7 @@ static int dvb_register(struct cx8802_dev *dev)
1042 0x08, ISL6421_DCL, 0x00); 1042 0x08, ISL6421_DCL, 0x00);
1043 } 1043 }
1044 break; 1044 break;
1045 case CX88_BOARD_PROF_6200:
1045 case CX88_BOARD_TBS_8910: 1046 case CX88_BOARD_TBS_8910:
1046 case CX88_BOARD_TEVII_S420: 1047 case CX88_BOARD_TEVII_S420:
1047 fe0->dvb.frontend = dvb_attach(stv0299_attach, 1048 fe0->dvb.frontend = dvb_attach(stv0299_attach,
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index ae1b89a88bcd..20649b25f7ba 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -230,6 +230,7 @@ extern struct sram_channel cx88_sram_channels[];
230#define CX88_BOARD_PROF_7300 75 230#define CX88_BOARD_PROF_7300 75
231#define CX88_BOARD_SATTRADE_ST4200 76 231#define CX88_BOARD_SATTRADE_ST4200 76
232#define CX88_BOARD_TBS_8910 77 232#define CX88_BOARD_TBS_8910 77
233#define CX88_BOARD_PROF_6200 78
233 234
234enum cx88_itype { 235enum cx88_itype {
235 CX88_VMUX_COMPOSITE1 = 1, 236 CX88_VMUX_COMPOSITE1 = 1,