korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-16 16:54:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

[media] make the other drivers take use of the new ts2020 driver

Browse Source 
make the other drivers take use of the separate ts2020 driver

Signed-off-by: Konstantin Dimitrov <kosio.dimitrov@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Konstantin Dimitrov 2012-12-23 19:25:38 -03:00 committed by Mauro Carvalho Chehab
parent 6fef4fc71e
commit 73f0af44a9
9 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/dvb-frontends/ds3000.c
View File

@ -27,6 +27,7 @@
#include <linux/firmware.h> #include <linux/firmware.h>
#include "dvb_frontend.h" #include "dvb_frontend.h"
#include "ts2020.h"
#include "ds3000.h" #include "ds3000.h"
static int debug; static int debug;

1
drivers/media/pci/cx23885/Kconfig
View File

@ -25,6 +25,7 @@ config VIDEO_CX23885
select DVB_CX24116 if MEDIA_SUBDRV_AUTOSELECT select DVB_CX24116 if MEDIA_SUBDRV_AUTOSELECT
select DVB_STV0900 if MEDIA_SUBDRV_AUTOSELECT select DVB_STV0900 if MEDIA_SUBDRV_AUTOSELECT
select DVB_DS3000 if MEDIA_SUBDRV_AUTOSELECT select DVB_DS3000 if MEDIA_SUBDRV_AUTOSELECT
select DVB_TS2020 if MEDIA_SUBDRV_AUTOSELECT
select DVB_STV0367 if MEDIA_SUBDRV_AUTOSELECT select DVB_STV0367 if MEDIA_SUBDRV_AUTOSELECT
select DVB_TDA10071 if MEDIA_SUBDRV_AUTOSELECT select DVB_TDA10071 if MEDIA_SUBDRV_AUTOSELECT
select DVB_A8293 if MEDIA_SUBDRV_AUTOSELECT select DVB_A8293 if MEDIA_SUBDRV_AUTOSELECT

10
drivers/media/pci/cx23885/cx23885-dvb.c
View File

@ -57,6 +57,7 @@
#include "netup-init.h" #include "netup-init.h"
#include "lgdt3305.h" #include "lgdt3305.h"
#include "atbm8830.h" #include "atbm8830.h"
#include "ts2020.h"
#include "ds3000.h" #include "ds3000.h"
#include "cx23885-f300.h" #include "cx23885-f300.h"
#include "altera-ci.h" #include "altera-ci.h"
@ -471,6 +472,10 @@ static struct ds3000_config tevii_ds3000_config = {
.demod_address = 0x68, .demod_address = 0x68,
}; };
static struct ts2020_config tevii_ts2020_config = {
.tuner_address = 0x60,
};
static struct cx24116_config dvbworld_cx24116_config = { static struct cx24116_config dvbworld_cx24116_config = {
.demod_address = 0x05, .demod_address = 0x05,
}; };
@ -1027,8 +1032,11 @@ static int dvb_register(struct cx23885_tsport *port)
fe0->dvb.frontend = dvb_attach(ds3000_attach, fe0->dvb.frontend = dvb_attach(ds3000_attach,
&tevii_ds3000_config, &tevii_ds3000_config,
&i2c_bus->i2c_adap); &i2c_bus->i2c_adap);
if (fe0->dvb.frontend != NULL) if (fe0->dvb.frontend != NULL) {
dvb_attach(ts2020_attach, fe0->dvb.frontend,
&tevii_ts2020_config, &i2c_bus->i2c_adap);
fe0->dvb.frontend->ops.set_voltage = f300_set_voltage; fe0->dvb.frontend->ops.set_voltage = f300_set_voltage;
}
break; break;
case CX23885_BOARD_DVBWORLD_2005: case CX23885_BOARD_DVBWORLD_2005:

2
drivers/media/pci/cx88/Kconfig
View File

@ -62,6 +62,8 @@ config VIDEO_CX88_DVB
select DVB_STB6000 if MEDIA_SUBDRV_AUTOSELECT select DVB_STB6000 if MEDIA_SUBDRV_AUTOSELECT
select DVB_STV0900 if MEDIA_SUBDRV_AUTOSELECT select DVB_STV0900 if MEDIA_SUBDRV_AUTOSELECT
select DVB_STB6100 if MEDIA_SUBDRV_AUTOSELECT select DVB_STB6100 if MEDIA_SUBDRV_AUTOSELECT
select DVB_DS3000 if MEDIA_SUBDRV_AUTOSELECT
select DVB_TS2020 if MEDIA_SUBDRV_AUTOSELECT
select MEDIA_TUNER_SIMPLE if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_SIMPLE if MEDIA_SUBDRV_AUTOSELECT
---help--- ---help---
This adds support for DVB/ATSC cards based on the This adds support for DVB/ATSC cards based on the

10
drivers/media/pci/cx88/cx88-dvb.c
View File

@ -58,6 +58,7 @@
#include "stb6100.h" #include "stb6100.h"
#include "stb6100_proc.h" #include "stb6100_proc.h"
#include "mb86a16.h" #include "mb86a16.h"
#include "ts2020.h"
#include "ds3000.h" #include "ds3000.h"
MODULE_DESCRIPTION("driver for cx2388x based DVB cards"); MODULE_DESCRIPTION("driver for cx2388x based DVB cards");
@ -700,6 +701,10 @@ static struct ds3000_config tevii_ds3000_config = {
.set_ts_params = ds3000_set_ts_param, .set_ts_params = ds3000_set_ts_param,
}; };
static struct ts2020_config tevii_ts2020_config = {
.tuner_address = 0x60,
};
static const struct stv0900_config prof_7301_stv0900_config = { static const struct stv0900_config prof_7301_stv0900_config = {
.demod_address = 0x6a, .demod_address = 0x6a,
/* demod_mode = 0,*/ /* demod_mode = 0,*/
@ -1466,9 +1471,12 @@ static int dvb_register(struct cx8802_dev *dev)
fe0->dvb.frontend = dvb_attach(ds3000_attach, fe0->dvb.frontend = dvb_attach(ds3000_attach,
&tevii_ds3000_config, &tevii_ds3000_config,
&core->i2c_adap); &core->i2c_adap);
if (fe0->dvb.frontend != NULL) if (fe0->dvb.frontend != NULL) {
dvb_attach(ts2020_attach, fe0->dvb.frontend,
&tevii_ts2020_config, &core->i2c_adap);
fe0->dvb.frontend->ops.set_voltage = fe0->dvb.frontend->ops.set_voltage =
tevii_dvbs_set_voltage; tevii_dvbs_set_voltage;
}
break; break;
case CX88_BOARD_OMICOM_SS4_PCI: case CX88_BOARD_OMICOM_SS4_PCI:
case CX88_BOARD_TBS_8920: case CX88_BOARD_TBS_8920:

1
drivers/media/pci/dm1105/Kconfig
View File

@ -8,6 +8,7 @@ config DVB_DM1105
select DVB_CX24116 if MEDIA_SUBDRV_AUTOSELECT select DVB_CX24116 if MEDIA_SUBDRV_AUTOSELECT
select DVB_SI21XX if MEDIA_SUBDRV_AUTOSELECT select DVB_SI21XX if MEDIA_SUBDRV_AUTOSELECT
select DVB_DS3000 if MEDIA_SUBDRV_AUTOSELECT select DVB_DS3000 if MEDIA_SUBDRV_AUTOSELECT
select DVB_TS2020 if MEDIA_SUBDRV_AUTOSELECT
depends on RC_CORE depends on RC_CORE
help help
Support for cards based on the SDMC DM1105 PCI chip like Support for cards based on the SDMC DM1105 PCI chip like

10
drivers/media/pci/dm1105/dm1105.c
View File

@ -45,6 +45,7 @@
#include "si21xx.h" #include "si21xx.h"
#include "cx24116.h" #include "cx24116.h"
#include "z0194a.h" #include "z0194a.h"
#include "ts2020.h"
#include "ds3000.h" #include "ds3000.h"
#define MODULE_NAME "dm1105" #define MODULE_NAME "dm1105"
@ -849,6 +850,10 @@ static struct ds3000_config dvbworld_ds3000_config = {
.demod_address = 0x68, .demod_address = 0x68,
}; };
static struct ts2020_config dvbworld_ts2020_config = {
.tuner_address = 0x60,
};
static int __devinit frontend_init(struct dm1105_dev *dev) static int __devinit frontend_init(struct dm1105_dev *dev)
{ {
int ret; int ret;
@ -898,8 +903,11 @@ static int __devinit frontend_init(struct dm1105_dev *dev)
dev->fe = dvb_attach( dev->fe = dvb_attach(
ds3000_attach, &dvbworld_ds3000_config, ds3000_attach, &dvbworld_ds3000_config,
&dev->i2c_adap); &dev->i2c_adap);
if (dev->fe) if (dev->fe) {
dvb_attach(ts2020_attach, dev->fe,
&dvbworld_ts2020_config, &dev->i2c_adap);
dev->fe->ops.set_voltage = dm1105_set_voltage; dev->fe->ops.set_voltage = dm1105_set_voltage;
}
break; break;
case DM1105_BOARD_DVBWORLD_2002: case DM1105_BOARD_DVBWORLD_2002:

1
drivers/media/usb/dvb-usb/Kconfig
View File

@ -267,6 +267,7 @@ config DVB_USB_DW2102
select DVB_MT312 if MEDIA_SUBDRV_AUTOSELECT select DVB_MT312 if MEDIA_SUBDRV_AUTOSELECT
select DVB_ZL10039 if MEDIA_SUBDRV_AUTOSELECT select DVB_ZL10039 if MEDIA_SUBDRV_AUTOSELECT
select DVB_DS3000 if MEDIA_SUBDRV_AUTOSELECT select DVB_DS3000 if MEDIA_SUBDRV_AUTOSELECT
select DVB_TS2020 if MEDIA_SUBDRV_AUTOSELECT
select DVB_STB6100 if MEDIA_SUBDRV_AUTOSELECT select DVB_STB6100 if MEDIA_SUBDRV_AUTOSELECT
select DVB_STV6110 if MEDIA_SUBDRV_AUTOSELECT select DVB_STV6110 if MEDIA_SUBDRV_AUTOSELECT
select DVB_STV0900 if MEDIA_SUBDRV_AUTOSELECT select DVB_STV0900 if MEDIA_SUBDRV_AUTOSELECT

17
drivers/media/usb/dvb-usb/dw2102.c
View File

@ -22,6 +22,7 @@
#include "tda1002x.h" #include "tda1002x.h"
#include "mt312.h" #include "mt312.h"
#include "zl10039.h" #include "zl10039.h"
#include "ts2020.h"
#include "ds3000.h" #include "ds3000.h"
#include "stv0900.h" #include "stv0900.h"
#include "stv6110.h" #include "stv6110.h"
@ -941,6 +942,10 @@ static struct ds3000_config dw2104_ds3000_config = {
.demod_address = 0x68, .demod_address = 0x68,
}; };
static struct ts2020_config dw2104_ts2020_config = {
.tuner_address = 0x60,
};
static struct stv0900_config dw2104a_stv0900_config = { static struct stv0900_config dw2104a_stv0900_config = {
.demod_address = 0x6a, .demod_address = 0x6a,
.demod_mode = 0, .demod_mode = 0,
@ -992,6 +997,10 @@ static struct ds3000_config su3000_ds3000_config = {
.ci_mode = 1, .ci_mode = 1,
}; };
static struct ts2020_config su3000_ts2020_config = {
.tuner_address = 0x60,
};
static int dw2104_frontend_attach(struct dvb_usb_adapter *d) static int dw2104_frontend_attach(struct dvb_usb_adapter *d)
{ {
struct dvb_tuner_ops *tuner_ops = NULL; struct dvb_tuner_ops *tuner_ops = NULL;
@ -1042,6 +1051,8 @@ static int dw2104_frontend_attach(struct dvb_usb_adapter *d)
d->fe_adap[0].fe = dvb_attach(ds3000_attach, &dw2104_ds3000_config, d->fe_adap[0].fe = dvb_attach(ds3000_attach, &dw2104_ds3000_config,
&d->dev->i2c_adap); &d->dev->i2c_adap);
if (d->fe_adap[0].fe != NULL) { if (d->fe_adap[0].fe != NULL) {
dvb_attach(ts2020_attach, d->fe_adap[0].fe,
&dw2104_ts2020_config, &d->dev->i2c_adap);
d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage;
info("Attached DS3000!\n"); info("Attached DS3000!\n");
return 0; return 0;
@ -1154,6 +1165,9 @@ static int ds3000_frontend_attach(struct dvb_usb_adapter *d)
if (d->fe_adap[0].fe == NULL) if (d->fe_adap[0].fe == NULL)
return -EIO; return -EIO;
dvb_attach(ts2020_attach, d->fe_adap[0].fe, &dw2104_ts2020_config,
&d->dev->i2c_adap);
st->old_set_voltage = d->fe_adap[0].fe->ops.set_voltage; st->old_set_voltage = d->fe_adap[0].fe->ops.set_voltage;
d->fe_adap[0].fe->ops.set_voltage = s660_set_voltage; d->fe_adap[0].fe->ops.set_voltage = s660_set_voltage;
@ -1214,6 +1228,9 @@ static int su3000_frontend_attach(struct dvb_usb_adapter *d)
if (d->fe_adap[0].fe == NULL) if (d->fe_adap[0].fe == NULL)
return -EIO; return -EIO;
dvb_attach(ts2020_attach, d->fe_adap[0].fe, &su3000_ts2020_config,
&d->dev->i2c_adap);
info("Attached DS3000!\n"); info("Attached DS3000!\n");
return 0; return 0;