diff options
| author | Hartmut Hackmann <devnull@localhost> | 2005-11-03 23:51:58 +0000 |
|---|---|---|
| committer | Hartmut Hackmann <devnull@localhost> | 2005-11-03 23:51:58 +0000 |
| commit | 76559bb7ba9b7e7ef07278bf545a7986998a58e7 (patch) | |
| tree | 9675b43be1bc97de992fb2ff77ba37cd54340183 /linux | |
| parent | 646e183e74465a8cd42787bcc68b0d12e7bc8b39 (diff) | |
| download | mediapointer-dvb-s2-76559bb7ba9b7e7ef07278bf545a7986998a58e7.tar.gz mediapointer-dvb-s2-76559bb7ba9b7e7ef07278bf545a7986998a58e7.tar.bz2 | |
- added dvb-t support for Asus P7134 Dual
- added pci id for ADS Tech Instant TV cardbus variant
Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t.online.de>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 12 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-dvb.c | 6 |
2 files changed, 13 insertions, 5 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index ba5694847..079132c5a 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-cards.c,v 1.111 2005/11/03 20:00:36 nsh Exp $ + * $Id: saa7134-cards.c,v 1.112 2005/11/03 23:51:58 hhackmann Exp $ * * device driver for philips saa7134 based TV cards * card-specific stuff. @@ -2433,9 +2433,7 @@ struct saa7134_board saa7134_boards[] = { .tuner_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET, .gpiomask = 1 << 21, -#if 0 .mpeg = SAA7134_MPEG_DVB, -#endif .inputs = {{ .name = name_tv, .vmux = 1, @@ -2869,13 +2867,18 @@ struct pci_device_id saa7134_pci_tbl[] = { .subvendor = 0x1421, .subdevice = 0x0350, /* PCI version */ .driver_data = SAA7134_BOARD_ADS_INSTANT_TV, - },{ .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7133, .subvendor = 0x1421, .subdevice = 0x0370, /* cardbus version */ .driver_data = SAA7134_BOARD_ADS_INSTANT_TV, + },{ + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, + .subvendor = 0x1421, + .subdevice = 0x1370, /* cardbus version */ + .driver_data = SAA7134_BOARD_ADS_INSTANT_TV, },{ /* Typhoon DVB-T Duo Digital/Analog Cardbus */ .vendor = PCI_VENDOR_ID_PHILIPS, @@ -3264,6 +3267,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) } break; case SAA7134_BOARD_PHILIPS_TIGER: + case SAA7134_BOARD_ASUSTeK_P7131_DUAL: /* this is a hybrid board, initialize to analog mode */ { u8 data[] = { 0x3c, 0x33, 0x68}; diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c index 7e9fe1270..86a3d195a 100644 --- a/linux/drivers/media/video/saa7134/saa7134-dvb.c +++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-dvb.c,v 1.33 2005/11/03 20:00:36 nsh Exp $ + * $Id: saa7134-dvb.c,v 1.34 2005/11/03 23:51:58 hhackmann Exp $ * * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs] * @@ -882,6 +882,10 @@ static int dvb_init(struct saa7134_dev *dev) dev->dvb.frontend = tda10046_attach(&philips_tiger_config, &dev->i2c_adap); break; + case SAA7134_BOARD_ASUSTeK_P7131_DUAL: + dev->dvb.frontend = tda10046_attach(&philips_tiger_config, + &dev->i2c_adap); + break; #endif #ifdef HAVE_NXT200X case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180: |