aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasiliy Temnikov <vaka@newmail.ru>2009-08-26 21:10:55 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-12 11:19:33 -0400
commit5a5e1da579beb38fa8bf7d0a80cfa027cd7a2751 (patch)
tree8cadaab9c26439f4af57579709074277f3977bd5
parent5bc53a9f91d15628b65761e43234137904627642 (diff)
V4L/DVB (12574): support AverMedia Studio 505
Added support to AverMedia Studio 505 [dougsland@redhat.com: fixed rejects and removed the change to add dk as default secam variant] [mchehab@redhat.com: fix a few CodingStyle issues] Signed-off-by: Vasiliy Temnikov <vaka@newmail.ru> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--Documentation/video4linux/CARDLIST.saa71341
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c43
-rw-r--r--drivers/media/video/saa7134/saa7134-input.c1
-rw-r--r--drivers/media/video/saa7134/saa7134.h1
4 files changed, 46 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index dc0576afe5dd..31d9f14d6c32 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -168,3 +168,4 @@
168167 -> Beholder BeholdTV 609 RDS [5ace:6092] 168167 -> Beholder BeholdTV 609 RDS [5ace:6092]
169168 -> Beholder BeholdTV 609 RDS [5ace:6093] 169168 -> Beholder BeholdTV 609 RDS [5ace:6093]
170169 -> Compro VideoMate S350/S300 [185b:c900] 170169 -> Compro VideoMate S350/S300 [185b:c900]
171170 -> AverMedia AverTV Studio 505 [1461:a115]
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 1a47e4a09b0d..fbc55616fafb 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -1364,6 +1364,42 @@ struct saa7134_board saa7134_boards[] = {
1364 .amux = LINE1, 1364 .amux = LINE1,
1365 }, 1365 },
1366 }, 1366 },
1367 [SAA7134_BOARD_AVERMEDIA_STUDIO_505] = {
1368 /* Vasiliy Temnikov <vaka@newmail.ru> */
1369 .name = "AverMedia AverTV Studio 505",
1370 .audio_clock = 0x00187de7,
1371 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
1372 .radio_type = UNSET,
1373 .tuner_addr = ADDR_UNSET,
1374 .radio_addr = ADDR_UNSET,
1375 .tda9887_conf = TDA9887_PRESENT,
1376 .inputs = { {
1377 .name = name_tv,
1378 .vmux = 1,
1379 .amux = LINE2,
1380 .tv = 1,
1381 }, {
1382 .name = name_comp1,
1383 .vmux = 0,
1384 .amux = LINE2,
1385 }, {
1386 .name = name_comp2,
1387 .vmux = 3,
1388 .amux = LINE2,
1389 },{
1390 .name = name_svideo,
1391 .vmux = 8,
1392 .amux = LINE2,
1393 } },
1394 .radio = {
1395 .name = name_radio,
1396 .amux = LINE2,
1397 },
1398 .mute = {
1399 .name = name_mute,
1400 .amux = LINE1,
1401 },
1402 },
1367 [SAA7134_BOARD_UPMOST_PURPLE_TV] = { 1403 [SAA7134_BOARD_UPMOST_PURPLE_TV] = {
1368 .name = "UPMOST PURPLE TV", 1404 .name = "UPMOST PURPLE TV",
1369 .audio_clock = 0x00187de7, 1405 .audio_clock = 0x00187de7,
@@ -5401,6 +5437,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
5401 .vendor = PCI_VENDOR_ID_PHILIPS, 5437 .vendor = PCI_VENDOR_ID_PHILIPS,
5402 .device = PCI_DEVICE_ID_PHILIPS_SAA7130, 5438 .device = PCI_DEVICE_ID_PHILIPS_SAA7130,
5403 .subvendor = 0x1461, /* Avermedia Technologies Inc */ 5439 .subvendor = 0x1461, /* Avermedia Technologies Inc */
5440 .subdevice = 0xa115,
5441 .driver_data = SAA7134_BOARD_AVERMEDIA_STUDIO_505,
5442 }, {
5443 .vendor = PCI_VENDOR_ID_PHILIPS,
5444 .device = PCI_DEVICE_ID_PHILIPS_SAA7130,
5445 .subvendor = 0x1461, /* Avermedia Technologies Inc */
5404 .subdevice = 0x2108, 5446 .subdevice = 0x2108,
5405 .driver_data = SAA7134_BOARD_AVERMEDIA_305, 5447 .driver_data = SAA7134_BOARD_AVERMEDIA_305,
5406 },{ 5448 },{
@@ -6508,6 +6550,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
6508 case SAA7134_BOARD_KWORLD_VSTREAM_XPERT: 6550 case SAA7134_BOARD_KWORLD_VSTREAM_XPERT:
6509 case SAA7134_BOARD_KWORLD_XPERT: 6551 case SAA7134_BOARD_KWORLD_XPERT:
6510 case SAA7134_BOARD_AVERMEDIA_STUDIO_305: 6552 case SAA7134_BOARD_AVERMEDIA_STUDIO_305:
6553 case SAA7134_BOARD_AVERMEDIA_STUDIO_505:
6511 case SAA7134_BOARD_AVERMEDIA_305: 6554 case SAA7134_BOARD_AVERMEDIA_305:
6512 case SAA7134_BOARD_AVERMEDIA_STUDIO_307: 6555 case SAA7134_BOARD_AVERMEDIA_STUDIO_307:
6513 case SAA7134_BOARD_AVERMEDIA_307: 6556 case SAA7134_BOARD_AVERMEDIA_307:
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index bd0bfdea5611..bfdecb953f96 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -445,6 +445,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
445 case SAA7134_BOARD_AVERMEDIA_305: 445 case SAA7134_BOARD_AVERMEDIA_305:
446 case SAA7134_BOARD_AVERMEDIA_307: 446 case SAA7134_BOARD_AVERMEDIA_307:
447 case SAA7134_BOARD_AVERMEDIA_STUDIO_305: 447 case SAA7134_BOARD_AVERMEDIA_STUDIO_305:
448 case SAA7134_BOARD_AVERMEDIA_STUDIO_505:
448 case SAA7134_BOARD_AVERMEDIA_STUDIO_307: 449 case SAA7134_BOARD_AVERMEDIA_STUDIO_307:
449 case SAA7134_BOARD_AVERMEDIA_STUDIO_507: 450 case SAA7134_BOARD_AVERMEDIA_STUDIO_507:
450 case SAA7134_BOARD_AVERMEDIA_STUDIO_507UA: 451 case SAA7134_BOARD_AVERMEDIA_STUDIO_507UA:
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index de9a7dd6508a..7bba44688bf9 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -293,6 +293,7 @@ struct saa7134_format {
293#define SAA7134_BOARD_BEHOLD_609RDS_MK3 167 293#define SAA7134_BOARD_BEHOLD_609RDS_MK3 167
294#define SAA7134_BOARD_BEHOLD_609RDS_MK5 168 294#define SAA7134_BOARD_BEHOLD_609RDS_MK5 168
295#define SAA7134_BOARD_VIDEOMATE_S350 169 295#define SAA7134_BOARD_VIDEOMATE_S350 169
296#define SAA7134_BOARD_AVERMEDIA_STUDIO_505 170
296 297
297#define SAA7134_MAXBOARDS 32 298#define SAA7134_MAXBOARDS 32
298#define SAA7134_INPUT_MAX 8 299#define SAA7134_INPUT_MAX 8