diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 40 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-input.c | 1 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 1 |
3 files changed, 42 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index e240b4baf0ed..e9c471cb04bb 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -4642,6 +4642,38 @@ struct saa7134_board saa7134_boards[] = { | |||
4642 | .amux = 2, | 4642 | .amux = 2, |
4643 | }, | 4643 | }, |
4644 | }, | 4644 | }, |
4645 | [SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS] = { | ||
4646 | .name = "Avermedia AVerTV GO 007 FM Plus", | ||
4647 | .audio_clock = 0x00187de7, | ||
4648 | .tuner_type = TUNER_PHILIPS_TDA8290, | ||
4649 | .radio_type = UNSET, | ||
4650 | .tuner_addr = ADDR_UNSET, | ||
4651 | .radio_addr = ADDR_UNSET, | ||
4652 | .gpiomask = 0x00300003, | ||
4653 | /* .gpiomask = 0x8c240003, */ | ||
4654 | .inputs = { { | ||
4655 | .name = name_tv, | ||
4656 | .vmux = 1, | ||
4657 | .amux = TV, | ||
4658 | .tv = 1, | ||
4659 | .gpio = 0x01, | ||
4660 | }, { | ||
4661 | .name = name_svideo, | ||
4662 | .vmux = 6, | ||
4663 | .amux = LINE1, | ||
4664 | .gpio = 0x02, | ||
4665 | } }, | ||
4666 | .radio = { | ||
4667 | .name = name_radio, | ||
4668 | .amux = TV, | ||
4669 | .gpio = 0x00300001, | ||
4670 | }, | ||
4671 | .mute = { | ||
4672 | .name = name_mute, | ||
4673 | .amux = TV, | ||
4674 | .gpio = 0x01, | ||
4675 | }, | ||
4676 | }, | ||
4645 | }; | 4677 | }; |
4646 | 4678 | ||
4647 | const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); | 4679 | const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); |
@@ -5739,6 +5771,13 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
5739 | .subdevice = PCI_ANY_ID, | 5771 | .subdevice = PCI_ANY_ID, |
5740 | .driver_data = SAA7134_BOARD_UNKNOWN, | 5772 | .driver_data = SAA7134_BOARD_UNKNOWN, |
5741 | },{ | 5773 | },{ |
5774 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
5775 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | ||
5776 | .subvendor = 0x1461, /* Avermedia Technologies Inc */ | ||
5777 | .subdevice = 0xf31d, | ||
5778 | .driver_data = SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS, | ||
5779 | |||
5780 | }, { | ||
5742 | /* --- end of list --- */ | 5781 | /* --- end of list --- */ |
5743 | } | 5782 | } |
5744 | }; | 5783 | }; |
@@ -5929,6 +5968,7 @@ int saa7134_board_init1(struct saa7134_dev *dev) | |||
5929 | case SAA7134_BOARD_GENIUS_TVGO_A11MCE: | 5968 | case SAA7134_BOARD_GENIUS_TVGO_A11MCE: |
5930 | case SAA7134_BOARD_REAL_ANGEL_220: | 5969 | case SAA7134_BOARD_REAL_ANGEL_220: |
5931 | case SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG: | 5970 | case SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG: |
5971 | case SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS: | ||
5932 | dev->has_remote = SAA7134_REMOTE_GPIO; | 5972 | dev->has_remote = SAA7134_REMOTE_GPIO; |
5933 | break; | 5973 | break; |
5934 | case SAA7134_BOARD_FLYDVBS_LR300: | 5974 | case SAA7134_BOARD_FLYDVBS_LR300: |
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c index d2124f64e4e2..8a106d36e723 100644 --- a/drivers/media/video/saa7134/saa7134-input.c +++ b/drivers/media/video/saa7134/saa7134-input.c | |||
@@ -449,6 +449,7 @@ int saa7134_input_init1(struct saa7134_dev *dev) | |||
449 | case SAA7134_BOARD_AVERMEDIA_STUDIO_507: | 449 | case SAA7134_BOARD_AVERMEDIA_STUDIO_507: |
450 | case SAA7134_BOARD_AVERMEDIA_GO_007_FM: | 450 | case SAA7134_BOARD_AVERMEDIA_GO_007_FM: |
451 | case SAA7134_BOARD_AVERMEDIA_M102: | 451 | case SAA7134_BOARD_AVERMEDIA_M102: |
452 | case SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS: | ||
452 | ir_codes = ir_codes_avermedia; | 453 | ir_codes = ir_codes_avermedia; |
453 | mask_keycode = 0x0007C8; | 454 | mask_keycode = 0x0007C8; |
454 | mask_keydown = 0x000010; | 455 | mask_keydown = 0x000010; |
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index f6c1fcc72070..14ee265f3374 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h | |||
@@ -276,6 +276,7 @@ struct saa7134_format { | |||
276 | #define SAA7134_BOARD_ADS_INSTANT_HDTV_PCI 151 | 276 | #define SAA7134_BOARD_ADS_INSTANT_HDTV_PCI 151 |
277 | #define SAA7134_BOARD_ASUSTeK_TIGER 152 | 277 | #define SAA7134_BOARD_ASUSTeK_TIGER 152 |
278 | #define SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG 153 | 278 | #define SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG 153 |
279 | #define SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS 154 | ||
279 | 280 | ||
280 | #define SAA7134_MAXBOARDS 32 | 281 | #define SAA7134_MAXBOARDS 32 |
281 | #define SAA7134_INPUT_MAX 8 | 282 | #define SAA7134_INPUT_MAX 8 |