diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-cards.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 16cd319dc4e..a827af4546d 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -4010,6 +4010,30 @@ struct saa7134_board saa7134_boards[] = { | |||
4010 | .amux = LINE1, | 4010 | .amux = LINE1, |
4011 | } }, | 4011 | } }, |
4012 | }, | 4012 | }, |
4013 | [SAA7134_BOARD_CREATIX_CTX953] = { | ||
4014 | .name = "Medion/Creatix CTX953 Hybrid", | ||
4015 | .audio_clock = 0x00187de7, | ||
4016 | .tuner_type = TUNER_PHILIPS_TDA8290, | ||
4017 | .radio_type = UNSET, | ||
4018 | .tuner_addr = ADDR_UNSET, | ||
4019 | .radio_addr = ADDR_UNSET, | ||
4020 | .tuner_config = 0, | ||
4021 | .mpeg = SAA7134_MPEG_DVB, | ||
4022 | .inputs = {{ | ||
4023 | .name = name_tv, | ||
4024 | .vmux = 1, | ||
4025 | .amux = TV, | ||
4026 | .tv = 1, | ||
4027 | }, { | ||
4028 | .name = name_comp1, | ||
4029 | .vmux = 0, | ||
4030 | .amux = LINE1, | ||
4031 | }, { | ||
4032 | .name = name_svideo, | ||
4033 | .vmux = 8, | ||
4034 | .amux = LINE1, | ||
4035 | } }, | ||
4036 | }, | ||
4013 | }; | 4037 | }; |
4014 | 4038 | ||
4015 | const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); | 4039 | const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); |
@@ -4960,6 +4984,12 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
4960 | .subvendor = 0x1822, /*Twinhan Technology Co. Ltd*/ | 4984 | .subvendor = 0x1822, /*Twinhan Technology Co. Ltd*/ |
4961 | .subdevice = 0x0022, | 4985 | .subdevice = 0x0022, |
4962 | .driver_data = SAA7134_BOARD_TWINHAN_DTV_DVB_3056, | 4986 | .driver_data = SAA7134_BOARD_TWINHAN_DTV_DVB_3056, |
4987 | }, { | ||
4988 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
4989 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | ||
4990 | .subvendor = 0x16be, | ||
4991 | .subdevice = 0x0010, /* Medion version CTX953_V.1.4.3 */ | ||
4992 | .driver_data = SAA7134_BOARD_CREATIX_CTX953, | ||
4963 | },{ | 4993 | },{ |
4964 | /* --- boards without eeprom + subsystem ID --- */ | 4994 | /* --- boards without eeprom + subsystem ID --- */ |
4965 | .vendor = PCI_VENDOR_ID_PHILIPS, | 4995 | .vendor = PCI_VENDOR_ID_PHILIPS, |
@@ -5359,6 +5389,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) | |||
5359 | case SAA7134_BOARD_MEDION_MD8800_QUADRO: | 5389 | case SAA7134_BOARD_MEDION_MD8800_QUADRO: |
5360 | case SAA7134_BOARD_AVERMEDIA_SUPER_007: | 5390 | case SAA7134_BOARD_AVERMEDIA_SUPER_007: |
5361 | case SAA7134_BOARD_TWINHAN_DTV_DVB_3056: | 5391 | case SAA7134_BOARD_TWINHAN_DTV_DVB_3056: |
5392 | case SAA7134_BOARD_CREATIX_CTX953: | ||
5362 | /* this is a hybrid board, initialize to analog mode | 5393 | /* this is a hybrid board, initialize to analog mode |
5363 | * and configure firmware eeprom address | 5394 | * and configure firmware eeprom address |
5364 | */ | 5395 | */ |