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

V4L/DVB (13336): stv0900: config definition for single/dual mode 



Signed-off-by: default avatarIgor M. Liplianin <liplianin@netup.ru>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 9329fb5b

drivers/media/dvb/frontends/stv0900.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ struct stv0900_reg { 


struct stv0900_config {

	u8 demod_address;

	u8 demod_mode;

	u32 xtal;

	u8 clkmode;/* 0 for CLKI,  2 for XTALI */

drivers/media/dvb/frontends/stv0900_core.c

+2 −2
Original line number Diff line number Diff line
@@ -1400,7 +1400,7 @@ static enum fe_stv0900_error stv0900_init_internal(struct dvb_frontend *fe, 


	dprintk("%s\n", __func__);



	if (temp_int != NULL) {

	if ((temp_int != NULL) && (p_init->demod_mode == STV0900_DUAL)) {

		state->internal = temp_int->internal;

		(state->internal->dmds_used)++;

		dprintk("%s: Find Internal Structure!\n", __func__);
@@ -1972,7 +1972,7 @@ struct dvb_frontend *stv0900_attach(const struct stv0900_config *config, 
	case 0:

	case 1:

		init_params.dmd_ref_clk  	= config->xtal;

		init_params.demod_mode		= STV0900_DUAL;

		init_params.demod_mode		= config->demod_mode;

		init_params.rolloff		= STV0900_35;

		init_params.path1_ts_clock	= config->path1_mode;

		init_params.tun1_maddress	= config->tun1_maddress;

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

+1 −0
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ static struct stv0900_reg stv0900_ts_regs[] = { 


static struct stv0900_config netup_stv0900_config = {

	.demod_address = 0x68,

	.demod_mode = 1, /* dual */

	.xtal = 8000000,

	.clkmode = 3,/* 0-CLKI, 2-XTALI, else AUTO */

	.diseqc_mode = 2,/* 2/3 PWM */