diff options
author | Michal Majchrowicz <mmajchrowicz@gmail.com> | 2006-09-13 15:42:42 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-26 11:30:36 -0400 |
commit | b04c1baf485f4c3a25d8dbc187156030f9247cb0 (patch) | |
tree | 6768cdbbecbac2e64f4dc0d1e046ccd42044b2a2 /drivers/media/video/saa7134/saa7134-cards.c | |
parent | 666c73d9e123b9ea230fcb1e2bf47fe0294332a8 (diff) |
V4L/DVB (4629): Saa7134: add card support for Proteus Pro 2309
Add card support for Proteus Pro 2309, based on saa7130 bridge
Signed-off-by: Michal Majchrowicz <mmajchrowicz@gmail.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-cards.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 39 |
1 files changed, 38 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index bd526ad79f5b..aa1db509f3d4 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -2934,7 +2934,37 @@ struct saa7134_board saa7134_boards[] = { | |||
2934 | .amux = LINE1, | 2934 | .amux = LINE1, |
2935 | }}, | 2935 | }}, |
2936 | }, | 2936 | }, |
2937 | 2937 | [SAA7134_BOARD_PROTEUS_2309] = { | |
2938 | .name = "Proteus Pro 2309", | ||
2939 | .audio_clock = 0x00187de7, | ||
2940 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, | ||
2941 | .radio_type = UNSET, | ||
2942 | .tuner_addr = ADDR_UNSET, | ||
2943 | .radio_addr = ADDR_UNSET, | ||
2944 | .tda9887_conf = TDA9887_PRESENT, | ||
2945 | .inputs = {{ | ||
2946 | .name = name_tv, | ||
2947 | .vmux = 1, | ||
2948 | .amux = LINE2, | ||
2949 | .tv = 1, | ||
2950 | },{ | ||
2951 | .name = name_comp1, | ||
2952 | .vmux = 0, | ||
2953 | .amux = LINE2, | ||
2954 | },{ | ||
2955 | .name = name_comp2, | ||
2956 | .vmux = 3, | ||
2957 | .amux = LINE2, | ||
2958 | },{ | ||
2959 | .name = name_svideo, | ||
2960 | .vmux = 8, | ||
2961 | .amux = LINE2, | ||
2962 | }}, | ||
2963 | .mute = { | ||
2964 | .name = name_mute, | ||
2965 | .amux = LINE1, | ||
2966 | }, | ||
2967 | }, | ||
2938 | }; | 2968 | }; |
2939 | 2969 | ||
2940 | const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); | 2970 | const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); |
@@ -3526,6 +3556,12 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
3526 | .subdevice = 0x0502, /* Cardbus version */ | 3556 | .subdevice = 0x0502, /* Cardbus version */ |
3527 | .driver_data = SAA7134_BOARD_FLYDVBT_DUO_CARDBUS, | 3557 | .driver_data = SAA7134_BOARD_FLYDVBT_DUO_CARDBUS, |
3528 | },{ | 3558 | },{ |
3559 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
3560 | .device = PCI_DEVICE_ID_PHILIPS_SAA7130, | ||
3561 | .subvendor = 0x0919, /* Philips Proteus PRO 2309 */ | ||
3562 | .subdevice = 0x2003, | ||
3563 | .driver_data = SAA7134_BOARD_PROTEUS_2309, | ||
3564 | },{ | ||
3529 | /* --- boards without eeprom + subsystem ID --- */ | 3565 | /* --- boards without eeprom + subsystem ID --- */ |
3530 | .vendor = PCI_VENDOR_ID_PHILIPS, | 3566 | .vendor = PCI_VENDOR_ID_PHILIPS, |
3531 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, | 3567 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, |
@@ -3628,6 +3664,7 @@ int saa7134_board_init1(struct saa7134_dev *dev) | |||
3628 | case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS: | 3664 | case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS: |
3629 | case SAA7134_BOARD_FLYDVBT_LR301: | 3665 | case SAA7134_BOARD_FLYDVBT_LR301: |
3630 | case SAA7134_BOARD_FLYDVBTDUO: | 3666 | case SAA7134_BOARD_FLYDVBTDUO: |
3667 | case SAA7134_BOARD_PROTEUS_2309: | ||
3631 | dev->has_remote = SAA7134_REMOTE_GPIO; | 3668 | dev->has_remote = SAA7134_REMOTE_GPIO; |
3632 | break; | 3669 | break; |
3633 | case SAA7134_BOARD_FLYDVBS_LR300: | 3670 | case SAA7134_BOARD_FLYDVBS_LR300: |