diff options
-rw-r--r-- | Documentation/video4linux/CARDLIST.saa7134 | 1 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 32 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 1 |
3 files changed, 34 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134 index c10cfd26d529..617c7572c001 100644 --- a/Documentation/video4linux/CARDLIST.saa7134 +++ b/Documentation/video4linux/CARDLIST.saa7134 | |||
@@ -87,3 +87,4 @@ | |||
87 | 86 -> LifeView FlyDVB-T [5168:0301] | 87 | 86 -> LifeView FlyDVB-T [5168:0301] |
88 | 87 -> ADS Instant TV Duo Cardbus PTV331 [0331:1421] | 88 | 87 -> ADS Instant TV Duo Cardbus PTV331 [0331:1421] |
89 | 88 -> Tevion DVB-T 220RF [17de:7201] | 89 | 88 -> Tevion DVB-T 220RF [17de:7201] |
90 | 89 -> ELSA EX-VISION 700TV [1131:7130] | ||
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 3f418620bacf..f5c79898fcfb 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -640,6 +640,32 @@ struct saa7134_board saa7134_boards[] = { | |||
640 | .tv = 1, | 640 | .tv = 1, |
641 | }}, | 641 | }}, |
642 | }, | 642 | }, |
643 | [SAA7134_BOARD_ELSA_700TV] = { | ||
644 | .name = "ELSA EX-VISION 700TV", | ||
645 | .audio_clock = 0x00187de7, | ||
646 | .tuner_type = TUNER_HITACHI_NTSC, | ||
647 | .radio_type = UNSET, | ||
648 | .tuner_addr = ADDR_UNSET, | ||
649 | .radio_addr = ADDR_UNSET, | ||
650 | .inputs = {{ | ||
651 | .name = name_tv, | ||
652 | .vmux = 4, | ||
653 | .amux = LINE2, | ||
654 | .tv = 1, | ||
655 | },{ | ||
656 | .name = name_comp1, | ||
657 | .vmux = 6, | ||
658 | .amux = LINE1, | ||
659 | },{ | ||
660 | .name = name_svideo, | ||
661 | .vmux = 7, | ||
662 | .amux = LINE1, | ||
663 | }}, | ||
664 | .mute = { | ||
665 | .name = name_mute, | ||
666 | .amux = TV, | ||
667 | }, | ||
668 | }, | ||
643 | [SAA7134_BOARD_ASUSTeK_TVFM7134] = { | 669 | [SAA7134_BOARD_ASUSTeK_TVFM7134] = { |
644 | .name = "ASUS TV-FM 7134", | 670 | .name = "ASUS TV-FM 7134", |
645 | .audio_clock = 0x00187de7, | 671 | .audio_clock = 0x00187de7, |
@@ -2831,6 +2857,12 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
2831 | .driver_data = SAA7134_BOARD_ELSA_500TV, | 2857 | .driver_data = SAA7134_BOARD_ELSA_500TV, |
2832 | },{ | 2858 | },{ |
2833 | .vendor = PCI_VENDOR_ID_PHILIPS, | 2859 | .vendor = PCI_VENDOR_ID_PHILIPS, |
2860 | .device = PCI_DEVICE_ID_PHILIPS_SAA7130, | ||
2861 | .subvendor = 0x1131, | ||
2862 | .subdevice = 0x7130, | ||
2863 | .driver_data = SAA7134_BOARD_ELSA_700TV, | ||
2864 | },{ | ||
2865 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
2834 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, | 2866 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, |
2835 | .subvendor = PCI_VENDOR_ID_ASUSTEK, | 2867 | .subvendor = PCI_VENDOR_ID_ASUSTEK, |
2836 | .subdevice = 0x4842, | 2868 | .subdevice = 0x4842, |
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index 691c10be459d..55a6733c363a 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h | |||
@@ -216,6 +216,7 @@ struct saa7134_format { | |||
216 | #define SAA7134_BOARD_FLYDVBT_LR301 86 | 216 | #define SAA7134_BOARD_FLYDVBT_LR301 86 |
217 | #define SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331 87 | 217 | #define SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331 87 |
218 | #define SAA7134_BOARD_TEVION_DVBT_220RF 88 | 218 | #define SAA7134_BOARD_TEVION_DVBT_220RF 88 |
219 | #define SAA7134_BOARD_ELSA_700TV 89 | ||
219 | 220 | ||
220 | #define SAA7134_MAXBOARDS 8 | 221 | #define SAA7134_MAXBOARDS 8 |
221 | #define SAA7134_INPUT_MAX 8 | 222 | #define SAA7134_INPUT_MAX 8 |