diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-cards.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 3824fba7fb1c..fdd7f48f3b76 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -2797,6 +2797,17 @@ struct saa7134_board saa7134_boards[] = { | |||
2797 | .amux = LINE1, | 2797 | .amux = LINE1, |
2798 | }}, | 2798 | }}, |
2799 | }, | 2799 | }, |
2800 | [SAA7134_BOARD_MD7134_BRIDGE_2] = { | ||
2801 | /* This card has two saa7134 chips on it, | ||
2802 | but only one of them is currently working. | ||
2803 | The programming for the primary decoder is | ||
2804 | in SAA7134_BOARD_MD7134 */ | ||
2805 | .name = "Medion 7134 Bridge #2", | ||
2806 | .audio_clock = 0x00187de7, | ||
2807 | .radio_type = UNSET, | ||
2808 | .tuner_addr = ADDR_UNSET, | ||
2809 | .radio_addr = ADDR_UNSET, | ||
2810 | }, | ||
2800 | }; | 2811 | }; |
2801 | 2812 | ||
2802 | const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); | 2813 | const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); |
@@ -3316,6 +3327,12 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
3316 | .subdevice = 0x6360, | 3327 | .subdevice = 0x6360, |
3317 | .driver_data = SAA7134_BOARD_AVERMEDIA_A169_B1, | 3328 | .driver_data = SAA7134_BOARD_AVERMEDIA_A169_B1, |
3318 | },{ | 3329 | },{ |
3330 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
3331 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, | ||
3332 | .subvendor = 0x16be, | ||
3333 | .subdevice = 0x0005, | ||
3334 | .driver_data = SAA7134_BOARD_MD7134_BRIDGE_2, | ||
3335 | },{ | ||
3319 | /* --- boards without eeprom + subsystem ID --- */ | 3336 | /* --- boards without eeprom + subsystem ID --- */ |
3320 | .vendor = PCI_VENDOR_ID_PHILIPS, | 3337 | .vendor = PCI_VENDOR_ID_PHILIPS, |
3321 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, | 3338 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, |
@@ -3471,6 +3488,7 @@ int saa7134_board_init1(struct saa7134_dev *dev) | |||
3471 | dev->has_remote = SAA7134_REMOTE_I2C; | 3488 | dev->has_remote = SAA7134_REMOTE_I2C; |
3472 | break; | 3489 | break; |
3473 | case SAA7134_BOARD_AVERMEDIA_A169_B: | 3490 | case SAA7134_BOARD_AVERMEDIA_A169_B: |
3491 | case SAA7134_BOARD_MD7134_BRIDGE_2: | ||
3474 | printk("%s: %s: dual saa713x broadcast decoders\n" | 3492 | printk("%s: %s: dual saa713x broadcast decoders\n" |
3475 | "%s: Sorry, none of the inputs to this chip are supported yet.\n" | 3493 | "%s: Sorry, none of the inputs to this chip are supported yet.\n" |
3476 | "%s: Dual decoder functionality is disabled for now, use the other chip.\n", | 3494 | "%s: Dual decoder functionality is disabled for now, use the other chip.\n", |