diff options
-rw-r--r-- | Documentation/video4linux/CARDLIST.saa7134 | 1 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 24 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 1 |
3 files changed, 26 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134 index 57439d081570..3bcfd88920df 100644 --- a/Documentation/video4linux/CARDLIST.saa7134 +++ b/Documentation/video4linux/CARDLIST.saa7134 | |||
@@ -73,3 +73,4 @@ | |||
73 | 72 -> RTD Embedded Technologies VFG7350 [1435:7350] | 73 | 72 -> RTD Embedded Technologies VFG7350 [1435:7350] |
74 | 73 -> RTD Embedded Technologies VFG7330 [1435:7330] | 74 | 73 -> RTD Embedded Technologies VFG7330 [1435:7330] |
75 | 74 -> LifeView FlyTV Platinum Mini2 [14c0:1212] | 75 | 74 -> LifeView FlyTV Platinum Mini2 [14c0:1212] |
76 | 75 -> AVerMedia AVerTVHD MCE A180 [1461:1044] | ||
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 3a4c59e7ca07..e6e50c0a80ce 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -2350,6 +2350,24 @@ struct saa7134_board saa7134_boards[] = { | |||
2350 | .amux = LINE2, | 2350 | .amux = LINE2, |
2351 | }}, | 2351 | }}, |
2352 | }, | 2352 | }, |
2353 | [SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180] = { | ||
2354 | /* FIXME: uses Alps Electric TDHU2, containing ATI NXT2004 ATSC Decoder */ | ||
2355 | .name = "AVerMedia AVerTVHD MCE A180", | ||
2356 | .audio_clock = 0x00187de7, | ||
2357 | .tuner_type = TUNER_ABSENT, | ||
2358 | .radio_type = UNSET, | ||
2359 | .tuner_addr = ADDR_UNSET, | ||
2360 | .radio_addr = ADDR_UNSET, | ||
2361 | .inputs = {{ | ||
2362 | .name = name_comp1, | ||
2363 | .vmux = 3, | ||
2364 | .amux = LINE2, | ||
2365 | },{ | ||
2366 | .name = name_svideo, | ||
2367 | .vmux = 8, | ||
2368 | .amux = LINE2, | ||
2369 | }}, | ||
2370 | }, | ||
2353 | }; | 2371 | }; |
2354 | 2372 | ||
2355 | const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); | 2373 | const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); |
@@ -2756,6 +2774,12 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
2756 | .subdevice = 0x7330, | 2774 | .subdevice = 0x7330, |
2757 | .driver_data = SAA7134_BOARD_RTD_VFG7330, | 2775 | .driver_data = SAA7134_BOARD_RTD_VFG7330, |
2758 | },{ | 2776 | },{ |
2777 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
2778 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | ||
2779 | .subvendor = 0x1461, | ||
2780 | .subdevice = 0x1044, | ||
2781 | .driver_data = SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180, | ||
2782 | },{ | ||
2759 | /* --- boards without eeprom + subsystem ID --- */ | 2783 | /* --- boards without eeprom + subsystem ID --- */ |
2760 | .vendor = PCI_VENDOR_ID_PHILIPS, | 2784 | .vendor = PCI_VENDOR_ID_PHILIPS, |
2761 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, | 2785 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, |
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index 93038c32a039..473c5dbb9b5f 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h | |||
@@ -201,6 +201,7 @@ struct saa7134_format { | |||
201 | #define SAA7134_BOARD_RTD_VFG7350 72 | 201 | #define SAA7134_BOARD_RTD_VFG7350 72 |
202 | #define SAA7134_BOARD_RTD_VFG7330 73 | 202 | #define SAA7134_BOARD_RTD_VFG7330 73 |
203 | #define SAA7134_BOARD_FLYTVPLATINUM_MINI2 74 | 203 | #define SAA7134_BOARD_FLYTVPLATINUM_MINI2 74 |
204 | #define SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180 75 | ||
204 | 205 | ||
205 | #define SAA7134_MAXBOARDS 8 | 206 | #define SAA7134_MAXBOARDS 8 |
206 | #define SAA7134_INPUT_MAX 8 | 207 | #define SAA7134_INPUT_MAX 8 |