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

Commit df42eaf2 authored by Hartmut Hackmann's avatar Hartmut Hackmann Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (3305): Added support for the ADS Instant TV DUO Cardbus PTV331 



Analog and DVB-T are working, Remote not yet.
This card is based on the new LifeView design, there should be many variants.

Signed-off-by: default avatarHartmut Hackmann <hartmut.hackmann@t-online.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 0eb3de20

Documentation/video4linux/CARDLIST.saa7134

+1 −0
Original line number Diff line number Diff line
@@ -85,3 +85,4 @@ 
 84 -> LifeView FlyDVB Trio                     [5168:0319]

 85 -> AverTV DVB-T 777                         [1461:2c05]

 86 -> LifeView FlyDVB-T                        [5168:0301]

 87 -> ADS Instant TV Duo Cardbus PTV331        [0331:1421]

drivers/media/video/saa7134/saa7134-cards.c

+35 −1
Original line number Diff line number Diff line
@@ -2657,7 +2657,23 @@ struct saa7134_board saa7134_boards[] = { 
			.amux = LINE2,

		}},

	},



	[SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331] = {

		.name           = "ADS Instant TV Duo Cardbus PTV331",

		.audio_clock    = 0x00200000,

		.tuner_type     = TUNER_PHILIPS_TDA8290,

		.radio_type     = UNSET,

		.tuner_addr	= ADDR_UNSET,

		.radio_addr	= ADDR_UNSET,

		.mpeg           = SAA7134_MPEG_DVB,

		.gpiomask       = 0x00600000, /* Bit 21 0=Radio, Bit 22 0=TV */

		.inputs = {{

			.name   = name_tv,

			.vmux   = 1,

			.amux   = TV,

			.tv     = 1,

			.gpio   = 0x00200000,

		}},

	},

};



const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -3140,6 +3156,12 @@ struct pci_device_id saa7134_pci_tbl[] = { 
		.subvendor    = 0x5168,

		.subdevice    = 0x0301,

		.driver_data  = SAA7134_BOARD_FLYDVBT_LR301,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x0331,

		.subdevice    = 0x1421,

		.driver_data  = SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331,

	},{

		/* --- boards without eeprom + subsystem ID --- */

		.vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -3263,6 +3285,10 @@ int saa7134_board_init1(struct saa7134_dev *dev) 
		saa_writeb(SAA7134_GPIO_GPMODE3, 0x08);

		saa_writeb(SAA7134_GPIO_GPSTATUS3, 0x06);

		break;

	case SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331:

		saa_writeb(SAA7134_GPIO_GPMODE3, 0x08);

		saa_writeb(SAA7134_GPIO_GPSTATUS3, 0x00);

		break;

	case SAA7134_BOARD_AVERMEDIA_CARDBUS:

		/* power-up tuner chip */

		saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   0xffffffff, 0xffffffff);
@@ -3413,6 +3439,14 @@ int saa7134_board_init2(struct saa7134_dev *dev) 
		i2c_transfer(&dev->i2c_adap, &msg, 1);

		}

		break;

	case SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331:

		/* make the tda10046 find its eeprom */

		{

		u8 data[] = { 0x3c, 0x33, 0x62};

		struct i2c_msg msg = {.addr=0x08, .flags=0, .buf=data, .len = sizeof(data)};

		i2c_transfer(&dev->i2c_adap, &msg, 1);

		}

		break;

	}

	return 0;

}

drivers/media/video/saa7134/saa7134-dvb.c

+43 −0
Original line number Diff line number Diff line
@@ -846,6 +846,45 @@ static struct tda1004x_config philips_tiger_config = { 
	.request_firmware = NULL,

};



/* ------------------------------------------------------------------ */



static int ads_duo_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)

{

	int ret;



	ret = philips_tda827xa_pll_set(0x61, fe, params);

	return ret;

};



static int ads_duo_dvb_mode(struct dvb_frontend *fe)

{

	struct saa7134_dev *dev = fe->dvb->priv;

	/* route TDA8275a AGC input to the channel decoder */

	saa_writeb(SAA7134_GPIO_GPSTATUS2, 0x60);

	return 0;

}



static void ads_duo_analog_mode(struct dvb_frontend *fe)

{

	struct saa7134_dev *dev = fe->dvb->priv;

	/* route TDA8275a AGC input to the analog IF chip*/

	saa_writeb(SAA7134_GPIO_GPSTATUS2, 0x20);

	philips_tda827xa_pll_sleep( 0x61, fe);

}



static struct tda1004x_config ads_tech_duo_config = {

	.demod_address = 0x08,

	.invert        = 1,

	.invert_oclk   = 0,

	.xtal_freq     = TDA10046_XTAL_16M,

	.agc_config    = TDA10046_AGC_TDA827X_GPL,

	.if_freq       = TDA10046_FREQ_045,

	.pll_init      = ads_duo_dvb_mode,

	.pll_set       = ads_duo_pll_set,

	.pll_sleep     = ads_duo_analog_mode,

	.request_firmware = NULL,

};



#endif



/* ------------------------------------------------------------------ */
@@ -928,6 +967,10 @@ static int dvb_init(struct saa7134_dev *dev) 
		dev->dvb.frontend = tda10046_attach(&tda827x_lifeview_config,

						    &dev->i2c_adap);

		break;

	case SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331:

		dev->dvb.frontend = tda10046_attach(&ads_tech_duo_config,

						    &dev->i2c_adap);

		break;

#endif

#ifdef HAVE_NXT200X

	case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180:

drivers/media/video/saa7134/saa7134.h

+1 −0
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ struct saa7134_format { 
#define SAA7134_BOARD_FLYDVB_TRIO 84

#define SAA7134_BOARD_AVERMEDIA_777 85

#define SAA7134_BOARD_FLYDVBT_LR301 86

#define SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331 87



#define SAA7134_MAXBOARDS 8

#define SAA7134_INPUT_MAX 8