diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-cards.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 0403ae9e5b8a..89f32107f46b 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -3266,6 +3266,29 @@ struct saa7134_board saa7134_boards[] = { | |||
3266 | .amux = 0, | 3266 | .amux = 0, |
3267 | }, | 3267 | }, |
3268 | }, | 3268 | }, |
3269 | [SAA7134_BOARD_CINERGY_HT_PCI] = { | ||
3270 | .name = "Terratec Cinergy HT PCI", | ||
3271 | .audio_clock = 0x00187de7, | ||
3272 | .tuner_type = TUNER_PHILIPS_TDA8290, | ||
3273 | .radio_type = UNSET, | ||
3274 | .tuner_addr = ADDR_UNSET, | ||
3275 | .radio_addr = ADDR_UNSET, | ||
3276 | .mpeg = SAA7134_MPEG_DVB, | ||
3277 | .inputs = {{ | ||
3278 | .name = name_tv, | ||
3279 | .vmux = 1, | ||
3280 | .amux = TV, | ||
3281 | .tv = 1, | ||
3282 | },{ | ||
3283 | .name = name_comp1, | ||
3284 | .vmux = 0, | ||
3285 | .amux = LINE1, | ||
3286 | },{ | ||
3287 | .name = name_svideo, | ||
3288 | .vmux = 6, | ||
3289 | .amux = LINE1, | ||
3290 | }}, | ||
3291 | }, | ||
3269 | }; | 3292 | }; |
3270 | 3293 | ||
3271 | const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); | 3294 | const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); |
@@ -3929,6 +3952,12 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
3929 | .subdevice = 0x230f, | 3952 | .subdevice = 0x230f, |
3930 | .driver_data = SAA7134_BOARD_ENCORE_ENLTV_FM, | 3953 | .driver_data = SAA7134_BOARD_ENCORE_ENLTV_FM, |
3931 | },{ | 3954 | },{ |
3955 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
3956 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | ||
3957 | .subvendor = 0x153b, | ||
3958 | .subdevice = 0x1175, | ||
3959 | .driver_data = SAA7134_BOARD_CINERGY_HT_PCI, | ||
3960 | },{ | ||
3932 | /* --- boards without eeprom + subsystem ID --- */ | 3961 | /* --- boards without eeprom + subsystem ID --- */ |
3933 | .vendor = PCI_VENDOR_ID_PHILIPS, | 3962 | .vendor = PCI_VENDOR_ID_PHILIPS, |
3934 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, | 3963 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, |
@@ -4260,6 +4289,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) | |||
4260 | } | 4289 | } |
4261 | break; | 4290 | break; |
4262 | case SAA7134_BOARD_CINERGY_HT_PCMCIA: | 4291 | case SAA7134_BOARD_CINERGY_HT_PCMCIA: |
4292 | case SAA7134_BOARD_CINERGY_HT_PCI: | ||
4263 | /* make the tda10046 find its eeprom */ | 4293 | /* make the tda10046 find its eeprom */ |
4264 | { | 4294 | { |
4265 | u8 data[] = { 0x3c, 0x33, 0x60}; | 4295 | u8 data[] = { 0x3c, 0x33, 0x60}; |