aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Bussenschutt <buzz@oska.com>2006-08-08 08:10:05 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-09-26 10:53:17 -0400
commit2acadefa311b480864d686fb3f7e5f79737d0187 (patch)
tree3fdae4ed7658c78dbe3713b74c76fc8c363b0cf3
parentd1009bd733a9324baff74611e0635e17fce4dfa2 (diff)
V4L/DVB (4362): Cx88: Shenzhen Tungsten Ages Tech TE-DTV-250 / Swann PCI TV Tuner card support
Add support for Shenzhen Tungsten Ages Tech TE-DTV-250 OEM for Swann PCI TV Tuner Card Signed-off-by: David Bussenschutt <buzz@oska.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--Documentation/video4linux/CARDLIST.cx881
-rw-r--r--drivers/media/video/cx88/cx88-cards.c33
-rw-r--r--drivers/media/video/cx88/cx88.h1
3 files changed, 35 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88
index 348b67ddc36b..76b3092c2a3a 100644
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
@@ -53,3 +53,4 @@
53 52 -> Geniatech DVB-S [14f1:0084] 53 52 -> Geniatech DVB-S [14f1:0084]
54 53 -> Hauppauge WinTV-HVR3000 TriMode Analog/DVB-S/DVB-T [0070:1404] 54 53 -> Hauppauge WinTV-HVR3000 TriMode Analog/DVB-S/DVB-T [0070:1404]
55 54 -> Norwood Micro TV Tuner 55 54 -> Norwood Micro TV Tuner
56 55 -> Shenzhen Tungsten Ages Tech TE-DTV-250 / Swann OEM [c180:c980]
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 83bfcecee2d3..ba3ff57bba75 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1251,6 +1251,35 @@ struct cx88_board cx88_boards[] = {
1251 .gpio0 = 0x070b, 1251 .gpio0 = 0x070b,
1252 }}, 1252 }},
1253 }, 1253 },
1254 [CX88_BOARD_TE_DTV_250_OEM_SWANN] = {
1255 .name = "Shenzhen Tungsten Ages Tech TE-DTV-250 / Swann OEM",
1256 .tuner_type = TUNER_LG_PAL_NEW_TAPC,
1257 .radio_type = UNSET,
1258 .tuner_addr = ADDR_UNSET,
1259 .radio_addr = ADDR_UNSET,
1260 .input = {{
1261 .type = CX88_VMUX_TELEVISION,
1262 .vmux = 0,
1263 .gpio0 = 0x003fffff,
1264 .gpio1 = 0x00e00000,
1265 .gpio2 = 0x003fffff,
1266 .gpio3 = 0x02000000,
1267 },{
1268 .type = CX88_VMUX_COMPOSITE1,
1269 .vmux = 1,
1270 .gpio0 = 0x003fffff,
1271 .gpio1 = 0x00e00000,
1272 .gpio2 = 0x003fffff,
1273 .gpio3 = 0x02000000,
1274 },{
1275 .type = CX88_VMUX_SVIDEO,
1276 .vmux = 2,
1277 .gpio0 = 0x003fffff,
1278 .gpio1 = 0x00e00000,
1279 .gpio2 = 0x003fffff,
1280 .gpio3 = 0x02000000,
1281 }},
1282 },
1254}; 1283};
1255const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards); 1284const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);
1256 1285
@@ -1509,6 +1538,10 @@ struct cx88_subid cx88_subids[] = {
1509 .subdevice = 0xc111, /* AverMedia M150-D */ 1538 .subdevice = 0xc111, /* AverMedia M150-D */
1510 /* This board is known to work with the ASUS PVR416 config */ 1539 /* This board is known to work with the ASUS PVR416 config */
1511 .card = CX88_BOARD_ASUS_PVR_416, 1540 .card = CX88_BOARD_ASUS_PVR_416,
1541 },{
1542 .subvendor = 0xc180,
1543 .subdevice = 0xc980,
1544 .card = CX88_BOARD_TE_DTV_250_OEM_SWANN,
1512 }, 1545 },
1513}; 1546};
1514const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids); 1547const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 0405d6d0157a..1c87c2ed216c 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -199,6 +199,7 @@ extern struct sram_channel cx88_sram_channels[];
199#define CX88_BOARD_GENIATECH_DVBS 52 199#define CX88_BOARD_GENIATECH_DVBS 52
200#define CX88_BOARD_HAUPPAUGE_HVR3000 53 200#define CX88_BOARD_HAUPPAUGE_HVR3000 53
201#define CX88_BOARD_NORWOOD_MICRO 54 201#define CX88_BOARD_NORWOOD_MICRO 54
202#define CX88_BOARD_TE_DTV_250_OEM_SWANN 55
202 203
203enum cx88_itype { 204enum cx88_itype {
204 CX88_VMUX_COMPOSITE1 = 1, 205 CX88_VMUX_COMPOSITE1 = 1,