diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-cards.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 38 |
1 files changed, 37 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index d65b9dd90342..3f418620bacf 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -2674,6 +2674,33 @@ struct saa7134_board saa7134_boards[] = { | |||
2674 | .gpio = 0x00200000, | 2674 | .gpio = 0x00200000, |
2675 | }}, | 2675 | }}, |
2676 | }, | 2676 | }, |
2677 | [SAA7134_BOARD_TEVION_DVBT_220RF] = { | ||
2678 | .name = "Tevion DVB-T 220RF", | ||
2679 | .audio_clock = 0x00187de7, | ||
2680 | .tuner_type = TUNER_PHILIPS_TDA8290, | ||
2681 | .radio_type = UNSET, | ||
2682 | .tuner_addr = ADDR_UNSET, | ||
2683 | .radio_addr = ADDR_UNSET, | ||
2684 | .mpeg = SAA7134_MPEG_DVB, | ||
2685 | .inputs = {{ | ||
2686 | .name = name_tv, | ||
2687 | .vmux = 1, | ||
2688 | .amux = TV, | ||
2689 | .tv = 1, | ||
2690 | },{ | ||
2691 | .name = name_comp1, | ||
2692 | .vmux = 3, | ||
2693 | .amux = LINE1, | ||
2694 | },{ | ||
2695 | .name = name_svideo, | ||
2696 | .vmux = 0, | ||
2697 | .amux = LINE1, | ||
2698 | }}, | ||
2699 | .radio = { | ||
2700 | .name = name_radio, | ||
2701 | .amux = LINE1, | ||
2702 | }, | ||
2703 | }, | ||
2677 | }; | 2704 | }; |
2678 | 2705 | ||
2679 | const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); | 2706 | const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); |
@@ -3163,6 +3190,12 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
3163 | .subdevice = 0x1421, | 3190 | .subdevice = 0x1421, |
3164 | .driver_data = SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331, | 3191 | .driver_data = SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331, |
3165 | },{ | 3192 | },{ |
3193 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
3194 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | ||
3195 | .subvendor = 0x17de, | ||
3196 | .subdevice = 0x7201, | ||
3197 | .driver_data = SAA7134_BOARD_TEVION_DVBT_220RF, | ||
3198 | },{ | ||
3166 | /* --- boards without eeprom + subsystem ID --- */ | 3199 | /* --- boards without eeprom + subsystem ID --- */ |
3167 | .vendor = PCI_VENDOR_ID_PHILIPS, | 3200 | .vendor = PCI_VENDOR_ID_PHILIPS, |
3168 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, | 3201 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, |
@@ -3431,8 +3464,11 @@ int saa7134_board_init2(struct saa7134_dev *dev) | |||
3431 | } | 3464 | } |
3432 | break; | 3465 | break; |
3433 | case SAA7134_BOARD_PHILIPS_TIGER: | 3466 | case SAA7134_BOARD_PHILIPS_TIGER: |
3467 | case SAA7134_BOARD_TEVION_DVBT_220RF: | ||
3434 | case SAA7134_BOARD_ASUSTeK_P7131_DUAL: | 3468 | case SAA7134_BOARD_ASUSTeK_P7131_DUAL: |
3435 | /* this is a hybrid board, initialize to analog mode */ | 3469 | /* this is a hybrid board, initialize to analog mode |
3470 | * and configure firmware eeprom address | ||
3471 | */ | ||
3436 | { | 3472 | { |
3437 | u8 data[] = { 0x3c, 0x33, 0x68}; | 3473 | u8 data[] = { 0x3c, 0x33, 0x68}; |
3438 | struct i2c_msg msg = {.addr=0x08, .flags=0, .buf=data, .len = sizeof(data)}; | 3474 | struct i2c_msg msg = {.addr=0x08, .flags=0, .buf=data, .len = sizeof(data)}; |