aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/pci/dm1105/dm1105.c
diff options
context:
space:
mode:
authorKonstantin Dimitrov2012-12-23 19:25:38 -0300
committerMauro Carvalho Chehab2012-12-27 19:27:15 -0200
commit73f0af44a9137cc2ab18e181f68f59d2ad3fe3f7 (patch)
treea4a69e8609e4d573368a2f58ea846b19b17bf1ee /drivers/media/pci/dm1105/dm1105.c
parent6fef4fc71e79282b673d7613cfc63da6bdeec5bd (diff)
[media] make the other drivers take use of the new ts2020 driver
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>
Diffstat (limited to 'drivers/media/pci/dm1105/dm1105.c')
-rw-r--r--drivers/media/pci/dm1105/dm1105.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/media/pci/dm1105/dm1105.c b/drivers/media/pci/dm1105/dm1105.c
index f288ffcc4b6b..79fe74aae1f9 100644
--- a/drivers/media/pci/dm1105/dm1105.c
+++ b/drivers/media/pci/dm1105/dm1105.c
@@ -45,6 +45,7 @@
#include "si21xx.h"
#include "cx24116.h"
#include "z0194a.h"
+#include "ts2020.h"
#include "ds3000.h"
#define MODULE_NAME "dm1105"
@@ -849,6 +850,10 @@ static struct ds3000_config dvbworld_ds3000_config = {
.demod_address = 0x68,
};
+static struct ts2020_config dvbworld_ts2020_config = {
+ .tuner_address = 0x60,
+};
+
static int __devinit frontend_init(struct dm1105_dev *dev)
{
int ret;
@@ -898,8 +903,11 @@ static int __devinit frontend_init(struct dm1105_dev *dev)
dev->fe = dvb_attach(
ds3000_attach, &dvbworld_ds3000_config,
&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;
+ }
break;
case DM1105_BOARD_DVBWORLD_2002: