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

Commit 0ccef6db authored by Michael Krufky's avatar Michael Krufky Committed by Linus Torvalds
Browse files

[PATCH] dvb/4vl: RF input selection fir 



Select the RF input connector based upon the type of demodulation selected.
 ANT RF connector is selected for 8-VSB and CABLE RF connector is selected
for QAM64/QAM256.  This only affects the cards that use the Microtune 4042
tuner.

Signed-off-by: default avatarMac Michaels <wmichaels1@earthlink.net>
Signed-off-by: default avatarMichael Krufky <mkrufky@m1k.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b6aef071

drivers/media/dvb/frontends/lgdt3302.c

+12 −0
Original line number Diff line number Diff line
@@ -214,6 +214,10 @@ static int lgdt3302_set_parameters(struct dvb_frontend* fe, 


			/* Select VSB mode and serial MPEG interface */

			top_ctrl_cfg[1] = 0x07;



			/* Select ANT connector if supported by card */

			if (state->config->pll_rf_set)

				state->config->pll_rf_set(fe, 1);

			break;



		case QAM_64:
@@ -221,6 +225,10 @@ static int lgdt3302_set_parameters(struct dvb_frontend* fe, 


			/* Select QAM_64 mode and serial MPEG interface */

			top_ctrl_cfg[1] = 0x04;



			/* Select CABLE connector if supported by card */

			if (state->config->pll_rf_set)

				state->config->pll_rf_set(fe, 0);

			break;



		case QAM_256:
@@ -228,6 +236,10 @@ static int lgdt3302_set_parameters(struct dvb_frontend* fe, 


			/* Select QAM_256 mode and serial MPEG interface */

			top_ctrl_cfg[1] = 0x05;



			/* Select CABLE connector if supported by card */

			if (state->config->pll_rf_set)

				state->config->pll_rf_set(fe, 0);

			break;

		default:

			printk(KERN_WARNING "lgdt3302: %s: Modulation type(%d) UNSUPPORTED\n", __FUNCTION__, param->u.vsb.modulation);

drivers/media/dvb/frontends/lgdt3302.h

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ struct lgdt3302_config 
	u8 demod_address;



	/* PLL interface */

	int (*pll_rf_set) (struct dvb_frontend* fe, int index);

	int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pll_address);



	/* Need to set device param for start_dma */

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

+18 −2
Original line number Diff line number Diff line 
/*

 * $Id: cx88-dvb.c,v 1.47 2005/07/20 05:20:37 mkrufky Exp $

 * $Id: cx88-dvb.c,v 1.48 2005/07/20 05:33:33 mkrufky Exp $

 *

 * device driver for Conexant 2388x based TV cards

 * MPEG Transport Stream (DVB) routines
@@ -223,6 +223,19 @@ static int lgdt3302_pll_set(struct dvb_frontend* fe, 
	return 0;

}



static int lgdt3302_pll_rf_set(struct dvb_frontend* fe, int index)

{

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

	struct cx88_core *core = dev->core;



	dprintk(1, "%s: index = %d\n", __FUNCTION__, index);

	if (index == 0)

		cx_clear(MO_GP0_IO, 8);

	else

		cx_set(MO_GP0_IO, 8);

	return 0;

}



static int lgdt3302_set_ts_param(struct dvb_frontend* fe, int is_punctured)

{

	struct cx8802_dev *dev= fe->dvb->priv;
@@ -296,8 +309,11 @@ static int dvb_register(struct cx8802_dev *dev) 


		cx_clear(MO_GP0_IO, 1);

		mdelay(100);

		cx_set(MO_GP0_IO, 9); // ANT connector too FIXME

		cx_set(MO_GP0_IO, 1);

		mdelay(200);



		/* Select RF connector callback */

		fusionhdtv_3_gold.pll_rf_set = lgdt3302_pll_rf_set;

		dev->core->pll_addr = 0x61;

		dev->core->pll_desc = &dvb_pll_microtune_4042;

		dev->dvb.frontend = lgdt3302_attach(&fusionhdtv_3_gold,