diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 22 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-dvb.c | 9 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 1 |
3 files changed, 32 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 602c614d74c5..6ce9c083de2d 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -2731,6 +2731,22 @@ struct saa7134_board saa7134_boards[] = { | |||
2731 | .amux = LINE1, | 2731 | .amux = LINE1, |
2732 | }, | 2732 | }, |
2733 | }, | 2733 | }, |
2734 | [SAA7134_BOARD_KWORLD_ATSC110] = { | ||
2735 | .name = "KWORLD ATSC110", | ||
2736 | .audio_clock = 0x00187de7, | ||
2737 | .tuner_type = TUNER_PHILIPS_TUV1236D, | ||
2738 | .radio_type = UNSET, | ||
2739 | .tuner_addr = ADDR_UNSET, | ||
2740 | .radio_addr = ADDR_UNSET, | ||
2741 | .tda9887_conf = TDA9887_PRESENT, | ||
2742 | .mpeg = SAA7134_MPEG_DVB, | ||
2743 | .inputs = {{ | ||
2744 | .name = name_tv, | ||
2745 | .vmux = 1, | ||
2746 | .amux = TV, | ||
2747 | .tv = 1, | ||
2748 | }}, | ||
2749 | }, | ||
2734 | }; | 2750 | }; |
2735 | 2751 | ||
2736 | const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); | 2752 | const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); |
@@ -3232,6 +3248,12 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
3232 | .subdevice = 0x7201, | 3248 | .subdevice = 0x7201, |
3233 | .driver_data = SAA7134_BOARD_TEVION_DVBT_220RF, | 3249 | .driver_data = SAA7134_BOARD_TEVION_DVBT_220RF, |
3234 | },{ | 3250 | },{ |
3251 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
3252 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, /* SAA7135HL */ | ||
3253 | .subvendor = 0x17de, | ||
3254 | .subdevice = 0x7350, | ||
3255 | .driver_data = SAA7134_BOARD_KWORLD_ATSC110, | ||
3256 | },{ | ||
3235 | /* --- boards without eeprom + subsystem ID --- */ | 3257 | /* --- boards without eeprom + subsystem ID --- */ |
3236 | .vendor = PCI_VENDOR_ID_PHILIPS, | 3258 | .vendor = PCI_VENDOR_ID_PHILIPS, |
3237 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, | 3259 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, |
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c index 56ca3fad55c4..354bbf7a1858 100644 --- a/drivers/media/video/saa7134/saa7134-dvb.c +++ b/drivers/media/video/saa7134/saa7134-dvb.c | |||
@@ -927,6 +927,12 @@ static struct nxt200x_config avertvhda180 = { | |||
927 | .pll_address = 0x61, | 927 | .pll_address = 0x61, |
928 | .pll_desc = &dvb_pll_tdhu2, | 928 | .pll_desc = &dvb_pll_tdhu2, |
929 | }; | 929 | }; |
930 | |||
931 | static struct nxt200x_config kworldatsc110 = { | ||
932 | .demod_address = 0x0a, | ||
933 | .pll_address = 0x61, | ||
934 | .pll_desc = &dvb_pll_tuv1236d, | ||
935 | }; | ||
930 | #endif | 936 | #endif |
931 | 937 | ||
932 | /* ------------------------------------------------------------------ */ | 938 | /* ------------------------------------------------------------------ */ |
@@ -1012,6 +1018,9 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1012 | case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180: | 1018 | case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180: |
1013 | dev->dvb.frontend = nxt200x_attach(&avertvhda180, &dev->i2c_adap); | 1019 | dev->dvb.frontend = nxt200x_attach(&avertvhda180, &dev->i2c_adap); |
1014 | break; | 1020 | break; |
1021 | case SAA7134_BOARD_KWORLD_ATSC110: | ||
1022 | dev->dvb.frontend = nxt200x_attach(&kworldatsc110, &dev->i2c_adap); | ||
1023 | break; | ||
1015 | #endif | 1024 | #endif |
1016 | default: | 1025 | default: |
1017 | printk("%s: Huh? unknown DVB card?\n",dev->name); | 1026 | printk("%s: Huh? unknown DVB card?\n",dev->name); |
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index 55a6733c363a..f8c9b6760732 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h | |||
@@ -217,6 +217,7 @@ struct saa7134_format { | |||
217 | #define SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331 87 | 217 | #define SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331 87 |
218 | #define SAA7134_BOARD_TEVION_DVBT_220RF 88 | 218 | #define SAA7134_BOARD_TEVION_DVBT_220RF 88 |
219 | #define SAA7134_BOARD_ELSA_700TV 89 | 219 | #define SAA7134_BOARD_ELSA_700TV 89 |
220 | #define SAA7134_BOARD_KWORLD_ATSC110 90 | ||
220 | 221 | ||
221 | #define SAA7134_MAXBOARDS 8 | 222 | #define SAA7134_MAXBOARDS 8 |
222 | #define SAA7134_INPUT_MAX 8 | 223 | #define SAA7134_INPUT_MAX 8 |