V4L/DVB updates
Subsystems (2)
cover V4L/DVB updates
This patch series is also available under v4l-dvb.git tree at:
kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
Linus, please pull these from master branch.
It contains the following stuff:
- Bt8xx documentation authors fix
- Drivers/media/dvb/frontends/mt312.c: cleanups
- Make a struct static
- Upstream sync - make 2 structs static
- Pinnacle PCTV 40i: add filtered Composite2 input
- Fixed saa7134 ALSA initialization with multiple cards
- Cxusb: fix lgdt3303 naming
- Fix maximum for the saturation and contrast controls.
- Restore power on defaults of tda9887 after tda8290 probe
- Dvb: fix __init/__exit section references in av7110 driver
- Removing personal email from DVB maintainers
- Fix stv0297 for qam128 on tt c1500 (saa7146)
- ELSA EX-VISION 500TV: fix incorrect PCI subsystem ID
Cheers,
Mauro.
V4L/DVB development is hosted at http://linuxtv.org
Development Mercurial trees are available at http://linuxtv.org/hg
---
Documentation/dvb/bt8xx.txt | 6 - Documentation/video4linux/CARDLIST.saa7134 | 4 MAINTAINERS | 1 drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 2 drivers/media/dvb/bt8xx/bt878.c | 2 drivers/media/dvb/bt8xx/dst.c | 2 drivers/media/dvb/dvb-usb/cxusb.c | 8 - drivers/media/dvb/frontends/Kconfig | 2 drivers/media/dvb/frontends/mt312.c | 116 +++++++------------- drivers/media/dvb/frontends/mt312.h | 6 - drivers/media/dvb/frontends/stv0297.c | 4 drivers/media/dvb/ttpci/av7110.c | 7 - drivers/media/dvb/ttpci/av7110_ir.c | 4 drivers/media/video/cx25840/cx25840-core.c | 4 drivers/media/video/saa7115.c | 4 drivers/media/video/saa7134/saa7134-alsa.c | 4 drivers/media/video/saa7134/saa7134-cards.c | 12 +- drivers/media/video/tda8290.c | 8 - 18 files changed, 87 insertions(+), 109 deletions(-)
PATCH 1/13 Bt8xx documentation authors fix
From: Michael Krufky <[email protected]>
Date: 1141009666 \-0300
- use one Author per line, which allows us to add more authors later without creating a mess.
- Add Michael Krufky due to -git commit
2cbeddc976645262dbe036d6ec0825f96af70da3
---
Documentation/dvb/bt8xx.txt | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
Documentation/dvb/bt8xx.txt +5 -1
@@ -111,4 +111,8 @@ source: linux/Documentation/video4linux If you have problems with this please do ask on the mailing list. -- -Authors: Richard Walker, Jamie Honan, Michael Hunold, Manu Abraham +Authors: Richard Walker, + Jamie Honan, + Michael Hunold, + Manu Abraham, + Michael Krufky
PATCH 2/13 Drivers/media/dvb/frontends/mt312.c: cleanups
In reply to [email protected]From: Adrian Bunk <[email protected]>
Date: 1141009669 \-0300
This patch contains the following possible cleanups:
- update the Kconfig help to mention the VP310
- merge vp310_attach and mt312_attach into a new vp310_mt312_attach to remove some code duplication
---
drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 2 - drivers/media/dvb/frontends/Kconfig | 2 - drivers/media/dvb/frontends/mt312.c | 116 +++++++++++------------------ drivers/media/dvb/frontends/mt312.h | 6 +- 4 files changed, 48 insertions(+), 78 deletions(-)
drivers/media/dvb/b2c2/flexcop-fe-tuner.c +1 -1
@@ -526,7 +526,7 @@ int flexcop_frontend_init(struct flexcopinfo ("found the stv0297 at i2c address: 0x%02x" ,alps_tdee4_stv0297_config.demod_address); }else /* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */ -if ((fc->fe =vp310_attach (&skystar23_samsung_tbdu18132_config, &fc->i2c_adap)) !=NULL ) { +if ((fc->fe =vp310_mt312_attach (&skystar23_samsung_tbdu18132_config, &fc->i2c_adap)) !=NULL ) { ops = fc->fe->ops; ops->diseqc_send_master_cmd = flexcop_diseqc_send_master_cmd;
drivers/media/dvb/frontends/Kconfig +1 -1
@@ -29,7 +29,7 @@ config DVB_TDA8083 A DVB-S tuner module. Say Y when you want to support this frontend. config DVB_MT312 - tristate "Zarlink MT312 based" + tristate "Zarlink VP310/MT312 based" depends on DVB_CORE help A DVB-S tuner module. Say Y when you want to support this frontend.
drivers/media/dvb/frontends/mt312.c +44 -72
131 lines not on this page · raw message
drivers/media/dvb/frontends/mt312.h +2 -4
@@ -38,10 +38,8 @@ struct mt312_config int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params); }; -extern struct dvb_frontend *mt312_attach (const struct mt312_config * config, -struct i2c_adapter * i2c); +struct dvb_frontend *vp310_mt312_attach (const struct mt312_config * config, +struct i2c_adapter * i2c); -extern struct dvb_frontend *vp310_attach (const struct mt312_config * config, -struct i2c_adapter * i2c);#endif // MT312_H
PATCH 3/13 Make a struct static
In reply to [email protected]From: Manu Abraham <[email protected]>
Date: 1141009672 \-0300
---
drivers/media/dvb/bt8xx/bt878.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/media/dvb/bt8xx/bt878.c +1 -1
@@ -382,7 +382,7 @@ bt878_device_control(struct bt878 *bt, uEXPORT_SYMBOL (bt878_device_control); -struct cards card_list[]__devinitdata = { +static struct cards card_list[]__devinitdata = { {0x01010071 ,BTTV_BOARD_NEBULA_DIGITV ,"Nebula Electronics DigiTV" }, {0x07611461 ,BTTV_BOARD_AVDVBT_761 ,"AverMedia AverTV DVB-T 761" },
PATCH 4/13 Upstream sync - make 2 structs static
In reply to [email protected]From: Adrian Bunk <[email protected]>
Date: 1141009675 \-0300
---
drivers/media/dvb/bt8xx/dst.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/media/dvb/bt8xx/dst.c +1 -1
@@ -602,7 +602,7 @@ static int dst_type_print(u8 type)*/ -struct dst_types dst_tlist[] = { +static struct dst_types dst_tlist[] = { { .device_id ="200103A" , .offset =0 ,
PATCH 5/13 Pinnacle PCTV 40i: add filtered Composite2 input
In reply to [email protected]From: Karsten Suehring <[email protected]>
Date: 1141009688 \-0300
This patch adds another composite input to the Pinnacle PCTV 100i definition which filters the chrominace signal from the luma input. This improves video quality for Composite signals on the S-Video connector of the card.
In addition the name string of the card is changed to include PCTV 40i and 50i since these cards are identical.
---
Documentation/video4linux/CARDLIST.saa7134 | 2 +- drivers/media/video/saa7134/saa7134-cards.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-)
Documentation/video4linux/CARDLIST.saa7134 +1 -1
@@ -75,7 +75,7 @@ 74 -> LifeView FlyTV Platinum Mini2 [14c0:1212] 75 -> AVerMedia AVerTVHD MCE A180 [1461:1044] 76 -> SKNet MonsterTV Mobile [1131:4ee9] - 77 -> Pinnacle PCTV 110i (saa7133) [11bd:002e] + 77 -> Pinnacle PCTV 40i/50i/110i (saa7133) [11bd:002e] 78 -> ASUSTeK P7131 Dual [1043:4862] 79 -> Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B) 80 -> ASUS Digimatrix TV [1043:0210]
drivers/media/video/saa7134/saa7134-cards.c +5 -1
@@ -2392,7 +2392,7 @@ struct saa7134_board saa7134_boards[] = }}, }, [SAA7134_BOARD_PINNACLE_PCTV_110i] = { - .name = "Pinnacle PCTV 110i (saa7133)", + .name = "Pinnacle PCTV 40i/50i/110i (saa7133)", .audio_clock = 0x00187de7, .tuner_type = TUNER_PHILIPS_TDA8290, .radio_type = UNSET,
@@ -2407,6 +2407,10 @@ struct saa7134_board saa7134_boards[] = },{ .name = name_comp1, .vmux = 1, + .amux = LINE2, + },{ + .name = name_comp2, + .vmux = 0, .amux = LINE2, },{ .name = name_svideo,
PATCH 6/13 Fixed saa7134 ALSA initialization with multiple cards
In reply to [email protected]From: Ricardo Cerqueira <[email protected]>
Date: 1141009691 \-0300
When multiple cards were installed, only the first card would have audio initialized, because only the first position in the array parameter defaulted to "1"
To make things worse, the "enable" parameter wasn't enabled, so there was no workaround.
---
drivers/media/video/saa7134/saa7134-alsa.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/media/video/saa7134/saa7134-alsa.c +3 -1
@@ -54,10 +54,12 @@ MODULE_PARM_DESC(debug,"enable debug messtatic int index[SNDRV_CARDS ] =SNDRV_DEFAULT_IDX ;/* Index 0-MAX */ static char *id[SNDRV_CARDS ] =SNDRV_DEFAULT_STR ;/* ID for this card */ -static int enable[SNDRV_CARDS ] = {1 , [1 ... (SNDRV_CARDS -1 )] =0 }; +static int enable[SNDRV_CARDS ] = {1 , [1 ... (SNDRV_CARDS -1 )] =1 };module_param_array (index, int,NULL ,0444 ); +module_param_array (enable, int,NULL ,0444 );MODULE_PARM_DESC (index,"Index value for SAA7134 capture interface(s)." ); +MODULE_PARM_DESC (enable,"Enable (or not) the SAA7134 capture interface(s)." ); #define dprintk(fmt, arg...) if (debug) \ printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ##arg)
PATCH 7/13 Cxusb: fix lgdt3303 naming
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1141009697 \-0300
The following are specific to lgdt3303, and are being renamed to reflect this.
- cxusb_lgdt330x_config renamed to cxusb_lgdt3303_config.
- cxusb_lgdt330x_frontend_attach renamed to cxusb_lgdt3303_frontend_attach.
---
drivers/media/dvb/dvb-usb/cxusb.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/media/dvb/dvb-usb/cxusb.c +4 -4
@@ -282,7 +282,7 @@ static struct cx22702_config cxusb_cx227 .pll_set = dvb_usb_pll_set_i2c, }; -static struct lgdt330x_config cxusb_lgdt330x_config = { +static struct lgdt330x_config cxusb_lgdt3303_config = { .demod_address =0x0e , .demod_chip =LGDT3303 , .pll_set = dvb_usb_pll_set_i2c,
@@ -357,14 +357,14 @@ static int cxusb_cx22702_frontend_attachreturn -EIO ; } -static int cxusb_lgdt330x_frontend_attach (struct dvb_usb_device *d) +static int cxusb_lgdt3303_frontend_attach (struct dvb_usb_device *d) {if (usb_set_interface (d->udev,0 ,7 ) <0 )err ("set interface failed" );cxusb_ctrl_msg (d,CMD_DIGITAL ,NULL ,0 ,NULL ,0 ); -if ((d->fe =lgdt330x_attach (&cxusb_lgdt330x_config, &d->i2c_adap)) !=NULL ) +if ((d->fe =lgdt330x_attach (&cxusb_lgdt3303_config, &d->i2c_adap)) !=NULL )return 0 ;return -EIO ;
@@ -506,7 +506,7 @@ static struct dvb_usb_properties cxusb_b .streaming_ctrl = cxusb_streaming_ctrl, .power_ctrl = cxusb_power_ctrl, - .frontend_attach = cxusb_lgdt330x_frontend_attach, + .frontend_attach = cxusb_lgdt3303_frontend_attach, .tuner_attach = cxusb_lgh064f_tuner_attach, .i2c_algo = &cxusb_i2c_algo,
PATCH 8/13 Fix maximum for the saturation and contrast controls.
In reply to [email protected]From: Hans Verkuil <[email protected]>
Date: 1141009700 \-0300
---
drivers/media/video/cx25840/cx25840-core.c | 4 ++-- drivers/media/video/saa7115.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/media/video/cx25840/cx25840-core.c +2 -2
@@ -567,7 +567,7 @@ static struct v4l2_queryctrl cx25840_qct .type = V4L2_CTRL_TYPE_INTEGER, .name = "Contrast", .minimum = 0, - .maximum = 255, + .maximum = 127, .step = 1, .default_value = 64, .flags = 0,
@@ -576,7 +576,7 @@ static struct v4l2_queryctrl cx25840_qct .type = V4L2_CTRL_TYPE_INTEGER, .name = "Saturation", .minimum = 0, - .maximum = 255, + .maximum = 127, .step = 1, .default_value = 64, .flags = 0,
drivers/media/video/saa7115.c +2 -2
@@ -1027,7 +1027,7 @@ static struct v4l2_queryctrl saa7115_qct .type = V4L2_CTRL_TYPE_INTEGER, .name = "Contrast", .minimum = 0, - .maximum = 255, + .maximum = 127, .step = 1, .default_value = 64, .flags = 0,
@@ -1036,7 +1036,7 @@ static struct v4l2_queryctrl saa7115_qct .type = V4L2_CTRL_TYPE_INTEGER, .name = "Saturation", .minimum = 0, - .maximum = 255, + .maximum = 127, .step = 1, .default_value = 64, .flags = 0,
PATCH 9/13 Restore power on defaults of tda9887 after tda8290 probe
In reply to [email protected]From: Hartmut Hackmann <hartmut.hackmann@t\-online.de>
Date: 1141009751 \-0300
The probing code for tda8290 changes the state of the tda9887 GP ports. The patch assumes that if probing for tda8290 failed, this must be a tda9887 and restores its power on defaults.
This should solve the module load order issue with some pinnacle cards.
---
drivers/media/video/saa7134/saa7134-cards.c | 4 ++-- drivers/media/video/tda8290.c | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-)
drivers/media/video/saa7134/saa7134-cards.c +2 -2
@@ -2187,7 +2187,7 @@ struct saa7134_board saa7134_boards[] = .radio_type = UNSET, .tuner_addr = 0x61, .radio_addr = ADDR_UNSET, - .tda9887_conf = TDA9887_PRESENT, + .tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE, .mpeg = SAA7134_MPEG_DVB, .inputs = {{ .name = name_tv,
@@ -2211,7 +2211,7 @@ struct saa7134_board saa7134_boards[] = .radio_type = UNSET, .tuner_addr = 0x61, .radio_addr = ADDR_UNSET, - .tda9887_conf = TDA9887_PRESENT, + .tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE, .mpeg = SAA7134_MPEG_DVB, .inputs = {{ .name = name_tv,
drivers/media/video/tda8290.c +5 -3
@@ -580,9 +580,10 @@ int tda8290_init(struct i2c_client *c)int tda8290_probe (struct i2c_client *c) { -unsigned char soft_reset[] = {0x00 ,0x00 }; -unsigned char easy_mode_b[] = {0x01 ,0x02 }; -unsigned char easy_mode_g[] = {0x01 ,0x04 }; +unsigned char soft_reset[] = {0x00 ,0x00 }; +unsigned char easy_mode_b[] = {0x01 ,0x02 }; +unsigned char easy_mode_g[] = {0x01 ,0x04 }; +unsigned char restore_9886[] = {0x00 ,0xd6 ,0x30 };unsigned char addr_dto_lsb =0x07 ;unsigned char data;
@@ -599,6 +600,7 @@ int tda8290_probe(struct i2c_client *c)return 0 ; } } +i2c_master_send (c, restore_9886,3 );return -1 ; }
PATCH 10/13 Dvb: fix __init/__exit section references in av7110 driver
In reply to [email protected]From: Johannes Stezenbach <[email protected]>
Date: 1141009760 \-0300
use __devinit/__devexit/__devexit_p() where appropriate
---
drivers/media/dvb/ttpci/av7110.c | 7 ++++--- drivers/media/dvb/ttpci/av7110_ir.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/media/dvb/ttpci/av7110.c +4 -3
@@ -2477,7 +2477,8 @@ static int frontend_init(struct av7110 ** The same behaviour of missing VSYNC can be duplicated on budget * cards, by seting DD1_INIT trigger mode 7 in 3rd nibble. */ -static int av7110_attach (struct saa7146_dev * dev,struct saa7146_pci_extension_data *pci_ext) +static int __devinit av7110_attach (struct saa7146_dev * dev, +struct saa7146_pci_extension_data *pci_ext) {const int length =TS_WIDTH *TS_HEIGHT ;struct pci_dev *pdev = dev->pci;
@@ -2827,7 +2828,7 @@ err_kfree_0: goto out; } -static int av7110_detach (struct saa7146_dev * saa) +static int __devexit av7110_detach(struct saa7146_dev* saa) {struct av7110 *av7110 = saa->ext_priv;dprintk (4 ,"%p\n" , av7110);
@@ -2974,7 +2975,7 @@ static struct saa7146_extension av7110_e .module = THIS_MODULE, .pci_tbl = &pci_tbl[0], .attach = av7110_attach, - .detach = av7110_detach, + .detach = __devexit_p(av7110_detach), .irq_mask = MASK_19 | MASK_03 | MASK_10, .irq_func = av7110_irq,
drivers/media/dvb/ttpci/av7110_ir.c +2 -2
@@ -208,7 +208,7 @@ static void ir_handler(struct av7110 *av } -int __init av7110_ir_init (struct av7110 *av7110) +int __devinit av7110_ir_init (struct av7110 *av7110) {static struct proc_dir_entry *e;
@@ -248,7 +248,7 @@ int __init av7110_ir_init(struct av7110 } -void __exit av7110_ir_exit(struct av7110 *av7110) +void __devexit av7110_ir_exit(struct av7110 *av7110) {int i;
PATCH 11/13 Removing personal email from DVB maintainers
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
Date: 1141009641 \-0300
---
MAINTAINERS | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
MAINTAINERS +0 -1
@@ -838,7 +838,6 @@ S: Maintained DVB SUBSYSTEM AND DRIVERS P: LinuxTV.org Project -M: [email protected] M: [email protected] L: [email protected] (subscription required) W: http://linuxtv.org/
PATCH 12/13 Fix stv0297 for qam128 on tt c1500 (saa7146)
In reply to [email protected]From: Mattias Nordstrom <[email protected]>
Date: 1141009757 \-0300
I have a TT C1500 card (saa7146, STV0297) which had problems tuning channels at QAM128 (like the ones in the Finnish HTV / Welho network). A fix which seems to work perfectly so far is to change the delay for QAM128 to the same values as for QAM256 in stv0297_set_frontend(),
---
drivers/media/dvb/frontends/stv0297.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-)
drivers/media/dvb/frontends/stv0297.c +0 -4
@@ -393,10 +393,6 @@ static int stv0297_set_frontend(struct dbreak ;case QAM_128 : - delay =150 ; - sweeprate =1000 ; -break ; -case QAM_256 : delay =200 ; sweeprate =500 ;
PATCH 13/13 ELSA EX-VISION 500TV: fix incorrect PCI subsystem ID
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1141064569 \-0300
- ELSA EX-VISION 500TV was incorrectly programmed to have the same subsystem ID as ELSA EX-VISION 300TV, (1048:226b)
- This changeset replaces the incorrect subsystem ID (1048:226b) with the correct one (1048:226a) for the ELSA EX-VISION 500TV.
---
Documentation/video4linux/CARDLIST.saa7134 | 2 +- drivers/media/video/saa7134/saa7134-cards.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Documentation/video4linux/CARDLIST.saa7134 +1 -1
@@ -13,7 +13,7 @@ 12 -> Medion 7134 [16be:0003] 13 -> Typhoon TV+Radio 90031 14 -> ELSA EX-VISION 300TV [1048:226b] - 15 -> ELSA EX-VISION 500TV [1048:226b] + 15 -> ELSA EX-VISION 500TV [1048:226a] 16 -> ASUS TV-FM 7134 [1043:4842,1043:4830,1043:4840] 17 -> AOPEN VA1000 POWER [1131:7133] 18 -> BMK MPEX No Tuner
drivers/media/video/saa7134/saa7134-cards.c +1 -1
@@ -2749,7 +2749,7 @@ struct pci_device_id saa7134_pci_tbl[] = .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7130, .subvendor = 0x1048, - .subdevice = 0x226b, + .subdevice = 0x226a, .driver_data = SAA7134_BOARD_ELSA_500TV, },{ .vendor = PCI_VENDOR_ID_PHILIPS,