diff options
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-dvb.c | 33 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 9 |
2 files changed, 23 insertions, 19 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c index 6a85830f3..09fa4d18a 100644 --- a/linux/drivers/media/video/cx88/cx88-dvb.c +++ b/linux/drivers/media/video/cx88/cx88-dvb.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-dvb.c,v 1.16 2004/11/03 09:04:51 kraxel Exp $ + * $Id: cx88-dvb.c,v 1.17 2004/11/05 09:40:59 kraxel Exp $ * * device driver for Conexant 2388x based TV cards * MPEG Transport Stream (DVB) routines @@ -91,25 +91,26 @@ struct videobuf_queue_ops dvb_qops = { static int dvico_fusionhdtv_demod_init(struct dvb_frontend* fe) { - static u8 mt352_clock_config [] = { CLOCK_CTL, 0x38, 0x39 }; - static u8 mt352_reset [] = { RESET, 0x80 }; - static u8 mt352_adc_ctl_1_cfg [] = { ADC_CTL_1, 0x40 }; - static u8 mt352_agc_cfg [] = { AGC_TARGET, 0x24, 0x20 }; - static u8 mt352_gpp_ctl_cfg [] = { GPP_CTL, 0x33 }; - static u8 mt352_capt_range_cfg[] = { CAPT_RANGE, 0x32 }; - - mt352_write(fe, mt352_clock_config, sizeof(mt352_clock_config)); + static u8 clock_config [] = { CLOCK_CTL, 0x38, 0x39 }; + static u8 reset [] = { RESET, 0x80 }; + static u8 adc_ctl_1_cfg [] = { ADC_CTL_1, 0x40 }; + static u8 agc_cfg [] = { AGC_TARGET, 0x24, 0x20 }; + static u8 gpp_ctl_cfg [] = { GPP_CTL, 0x33 }; + static u8 capt_range_cfg[] = { CAPT_RANGE, 0x32 }; + + mt352_write(fe, clock_config, sizeof(mt352_clock_config)); udelay(200); - mt352_write(fe, mt352_reset, sizeof(mt352_reset)); - mt352_write(fe, mt352_adc_ctl_1_cfg, sizeof(mt352_adc_ctl_1_cfg)); - - mt352_write(fe, mt352_agc_cfg, sizeof(mt352_agc_cfg)); - mt352_write(fe, mt352_gpp_ctl_cfg, sizeof(mt352_gpp_ctl_cfg)); - mt352_write(fe, mt352_capt_range_cfg, sizeof(mt352_capt_range_cfg)); + mt352_write(fe, reset, sizeof(mt352_reset)); + mt352_write(fe, adc_ctl_1_cfg, sizeof(mt352_adc_ctl_1_cfg)); + mt352_write(fe, agc_cfg, sizeof(mt352_agc_cfg)); + mt352_write(fe, gpp_ctl_cfg, sizeof(mt352_gpp_ctl_cfg)); + mt352_write(fe, capt_range_cfg, sizeof(mt352_capt_range_cfg)); return 0; } +#define IF_FREQUENCYx6 217 /* 6 * 36.16666666667MHz */ + static int lg_z201_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf) { @@ -117,7 +118,6 @@ static int lg_z201_pll_set(struct dvb_frontend* fe, unsigned char cp = 0; unsigned char bs = 0; - #define IF_FREQUENCYx6 217 /* 6 * 36.16666666667MHz */ div = (((params->frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6; if (params->frequency < 542000000) cp = 0xbc; @@ -146,7 +146,6 @@ static int thomson_dtt7579_pll_set(struct dvb_frontend* fe, unsigned char cp = 0; unsigned char bs = 0; - #define IF_FREQUENCYx6 217 /* 6 * 36.16666666667MHz */ div = (((params->frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6; if (params->frequency < 542000000) cp = 0xb4; diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index 7290810eb..3dfab5f1a 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.33 2004/11/04 11:03:52 kraxel Exp $ + * $Id: saa7134-cards.c,v 1.34 2004/11/05 09:40:59 kraxel Exp $ * * device driver for philips saa7134 based TV cards * card-specific stuff. @@ -1075,7 +1075,6 @@ struct saa7134_board saa7134_boards[] = { .name = name_tv, .vmux = 1, .amux = LINE2, - .gpio = 0x0000, .tv = 1, },{ .name = name_comp1, @@ -1324,6 +1323,12 @@ struct pci_device_id saa7134_pci_tbl[] = { .driver_data = SAA7134_BOARD_CINERGY600, },{ .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, + .subvendor = 0x153b, + .subdevice = 0x1162, + .driver_data = SAA7134_BOARD_CINERGY400_CARDBUS, + },{ + .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7134, .subvendor = 0x5168, .subdevice = 0x0138, |