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

V4L/DVB (4307): Added support for the md8800 quadro board 



Analog TV, CVBS, S-video and DVB-T are working,
DVB-S not yet

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

Documentation/video4linux/CARDLIST.saa7134

+1 −0
Original line number Diff line number Diff line
@@ -94,3 +94,4 @@ 
 93 -> Medion 7134 Bridge #2                    [16be:0005]

 94 -> LifeView FlyDVB-T Hybrid Cardbus         [5168:3306,5168:3502]

 95 -> LifeView FlyVIDEO3000 (NTSC)             [5169:0138]

 96 -> Medion Md8800 Quadro                     [16be:0007,16be:0008]

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

+36 −0
Original line number Diff line number Diff line
@@ -2891,6 +2891,29 @@ struct saa7134_board saa7134_boards[] = { 
			.gpio = 0x8000,

		},

	},

	[SAA7134_BOARD_MEDION_MD8800_QUADRO] = {

		.name           = "Medion Md8800 Quadro",

		.audio_clock    = 0x00187de7,

		.tuner_type     = TUNER_PHILIPS_TDA8290,

		.radio_type     = UNSET,

		.tuner_addr     = ADDR_UNSET,

		.radio_addr     = ADDR_UNSET,

		.mpeg           = SAA7134_MPEG_DVB,

		.inputs = {{

			.name   = name_tv,

			.vmux   = 1,

			.amux   = TV,

			.tv     = 1,

		},{

			.name   = name_comp1,

			.vmux   = 0,

			.amux   = LINE2,

		},{

			.name   = name_svideo,

			.vmux   = 8,

			.amux   = LINE2,

		}},

	},

};



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

		.subdevice    = 0x3502,  /* whats the difference to 0x3306 ?*/

		.driver_data  = SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x16be,

		.subdevice    = 0x0007,

		.driver_data  = SAA7134_BOARD_MEDION_MD8800_QUADRO,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x16be,

		.subdevice    = 0x0008,

		.driver_data  = SAA7134_BOARD_MEDION_MD8800_QUADRO,

	},{

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

		.vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -3732,6 +3767,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) 
	case SAA7134_BOARD_PHILIPS_TIGER:

	case SAA7134_BOARD_TEVION_DVBT_220RF:

	case SAA7134_BOARD_ASUSTeK_P7131_DUAL:

	case SAA7134_BOARD_MEDION_MD8800_QUADRO:

		/* this is a hybrid board, initialize to analog mode

		 * and configure firmware eeprom address

		 */

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

+54 −0
Original line number Diff line number Diff line
@@ -969,6 +969,51 @@ static struct tda1004x_config tevion_dvbt220rf_config = { 
	.request_firmware = NULL,

};



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



static int md8800_dvbt_analog_mode(struct dvb_frontend *fe)

{

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

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

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



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

	philips_tda827xa_tuner_sleep( 0x61, fe);

	return 0;

}



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

{

	int ret;

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

	static u8 tda8290_close[] = { 0x21, 0xc0};

	static u8 tda8290_open[]  = { 0x21, 0x80};

	struct i2c_msg tda8290_msg = {.addr = 0x4b,.flags = 0, .len = 2};

	/* close tda8290 i2c bridge */

	tda8290_msg.buf = tda8290_close;

	ret = i2c_transfer(&dev->i2c_adap, &tda8290_msg, 1);

	if (ret != 1)

		return -EIO;

	msleep(20);

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

	if (ret != 0)

		return ret;

	/* open tda8290 i2c bridge */

	tda8290_msg.buf = tda8290_open;

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

	return ret;

}



static struct tda1004x_config md8800_dvbt_config = {

	.demod_address = 0x08,

	.invert        = 1,

	.invert_oclk   = 0,

	.xtal_freq     = TDA10046_XTAL_16M,

	.agc_config    = TDA10046_AGC_TDA827X,

	.if_freq       = TDA10046_FREQ_045,

	.request_firmware = NULL,

};



#endif



/* ------------------------------------------------------------------ */
@@ -1153,6 +1198,15 @@ static int dvb_init(struct saa7134_dev *dev) 
			dev->dvb.frontend->ops.tuner_ops.set_params = ads_duo_tuner_set_params;

		}

		break;

	case SAA7134_BOARD_MEDION_MD8800_QUADRO:

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

						    &dev->i2c_adap);

		if (dev->dvb.frontend) {

			dev->dvb.frontend->ops.tuner_ops.init = philips_tiger_tuner_init;

			dev->dvb.frontend->ops.tuner_ops.sleep = md8800_dvbt_analog_mode;

			dev->dvb.frontend->ops.tuner_ops.set_params = md8800_dvbt_pll_set;

		}

		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
@@ -223,6 +223,7 @@ struct saa7134_format { 
#define SAA7134_BOARD_MD7134_BRIDGE_2     93

#define SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS 94

#define SAA7134_BOARD_FLYVIDEO3000_NTSC 95

#define SAA7134_BOARD_MEDION_MD8800_QUADRO 96



#define SAA7134_MAXBOARDS 8

#define SAA7134_INPUT_MAX 8