Commit 35d9c427 authored by Igor M. Liplianin's avatar Igor M. Liplianin Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (9012): Add support for DvbWorld 2004 DVB-S2 PCI adapter 



Add support for DvbWorld 2004 DVB-S2 PCI adapter.
The card contains dm1105 PCI chip and cx24116 demodulator

Signed-off-by: default avatarIgor M. Liplianin <liplianin@me.by>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 490c8684

drivers/media/dvb/dm1105/Kconfig

+10 −9
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ config DVB_DM1105 
	depends on DVB_CORE && PCI && I2C

	select DVB_PLL if !DVB_FE_CUSTOMISE

	select DVB_STV0299 if !DVB_FE_CUSTOMISE

	select DVB_CX24116 if !DVB_FE_CUSTOMISE

	help

	  Support for cards based on the SDMC DM1105 PCI chip like

	  DvbWorld 2002

drivers/media/dvb/dm1105/dm1105.c

+3 −7
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ 
#include "stv0299.h"

/*#include "stv0288.h"

 *#include "si21xx.h"

 *#include "stb6000.h"

 *#include "cx24116.h"*/

 *#include "stb6000.h"*/

#include "cx24116.h"

#include "z0194a.h"



/* ----------------------------------------------- */
@@ -605,11 +605,11 @@ static struct si21xx_config serit_config = { 
	.min_delay_ms = 100,



};

#endif /* keep */



static struct cx24116_config serit_sp2633_config = {

	.demod_address = 0x55,

};

#endif /* keep */



static int __devinit frontend_init(struct dm1105dvb *dm1105dvb)

{
@@ -651,15 +651,11 @@ static int __devinit frontend_init(struct dm1105dvb *dm1105dvb) 
#endif /* keep */

		break;

	case PCI_DEVICE_ID_DW2004:

#if 0

		dm1105dvb->fe = dvb_attach(

			cx24116_attach, &serit_sp2633_config,

			&dm1105dvb->i2c_adap);

		if (dm1105dvb->fe)

			dm1105dvb->fe->ops.set_voltage = dm1105dvb_set_voltage;

#else /* keep */

		dev_err(&dm1105dvb->pdev->dev, "needs cx24116 module\n");

#endif /* keep */

		break;

	}

drivers/media/dvb/Kconfig

+1 −1

File changed.

Contains only whitespace changes.