Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73f0af44 authored by Konstantin Dimitrov's avatar Konstantin Dimitrov Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarKonstantin Dimitrov <kosio.dimitrov@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 6fef4fc7

drivers/media/dvb-frontends/ds3000.c

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/firmware.h>



#include "dvb_frontend.h"

#include "ts2020.h"

#include "ds3000.h"



static int debug;

drivers/media/pci/cx23885/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ config VIDEO_CX23885 
	select DVB_CX24116 if MEDIA_SUBDRV_AUTOSELECT

	select DVB_STV0900 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_TDA10071 if MEDIA_SUBDRV_AUTOSELECT

	select DVB_A8293 if MEDIA_SUBDRV_AUTOSELECT

drivers/media/pci/cx23885/cx23885-dvb.c

+9 −1
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
#include "netup-init.h"

#include "lgdt3305.h"

#include "atbm8830.h"

#include "ts2020.h"

#include "ds3000.h"

#include "cx23885-f300.h"

#include "altera-ci.h"
@@ -471,6 +472,10 @@ static struct ds3000_config tevii_ds3000_config = { 
	.demod_address = 0x68,

};



static struct ts2020_config tevii_ts2020_config  = {

	.tuner_address = 0x60,

};



static struct cx24116_config dvbworld_cx24116_config = {

	.demod_address = 0x05,

};
@@ -1027,8 +1032,11 @@ static int dvb_register(struct cx23885_tsport *port) 
		fe0->dvb.frontend = dvb_attach(ds3000_attach,

					&tevii_ds3000_config,

					&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;

		}



		break;

	case CX23885_BOARD_DVBWORLD_2005:

drivers/media/pci/cx88/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ config VIDEO_CX88_DVB 
	select DVB_STB6000 if MEDIA_SUBDRV_AUTOSELECT

	select DVB_STV0900 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

	---help---

	  This adds support for DVB/ATSC cards based on the

drivers/media/pci/cx88/cx88-dvb.c

+9 −1
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
#include "stb6100.h"

#include "stb6100_proc.h"

#include "mb86a16.h"

#include "ts2020.h"

#include "ds3000.h"



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,

};



static struct ts2020_config tevii_ts2020_config  = {

	.tuner_address = 0x60,

};



static const struct stv0900_config prof_7301_stv0900_config = {

	.demod_address = 0x6a,

/*	demod_mode = 0,*/
@@ -1466,9 +1471,12 @@ static int dvb_register(struct cx8802_dev *dev) 
		fe0->dvb.frontend = dvb_attach(ds3000_attach,

						&tevii_ds3000_config,

						&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 =

							tevii_dvbs_set_voltage;

		}

		break;

	case CX88_BOARD_OMICOM_SS4_PCI:

	case CX88_BOARD_TBS_8920: