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

Commit 6b9e50c4 authored by Andreas Regel's avatar Andreas Regel Committed by Mauro Carvalho Chehab
Browse files

[media] stv090x: On STV0903 do not set registers of the second path 



Sometimes there is a problem when trying to access the non-existing registers
of the second demodulator path on the STV0903.

This change removes the calls in case the driver is used on a STV0903.

Signed-off-by: default avatarAndreas Regel <andreas.regel@gmx.de>
Acked-by: default avatarManu Abraham <manu@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent f67102c4

drivers/media/dvb-frontends/stv090x.c

+132 −9
Original line number Diff line number Diff line
@@ -4267,7 +4267,7 @@ static int stv090x_set_mclk(struct stv090x_state *state, u32 mclk, u32 clk) 
	return -1;

}



static int stv090x_set_tspath(struct stv090x_state *state)

static int stv0900_set_tspath(struct stv090x_state *state)

{

	u32 reg;
@@ -4538,6 +4538,121 @@ static int stv090x_set_tspath(struct stv090x_state *state) 
	return -1;

}



static int stv0903_set_tspath(struct stv090x_state *state)

{

	u32 reg;



	if (state->internal->dev_ver >= 0x20) {

		switch (state->config->ts1_mode) {

		case STV090x_TSMODE_PARALLEL_PUNCTURED:

		case STV090x_TSMODE_DVBCI:

			stv090x_write_reg(state, STV090x_TSGENERAL, 0x00);

			break;



		case STV090x_TSMODE_SERIAL_PUNCTURED:

		case STV090x_TSMODE_SERIAL_CONTINUOUS:

		default:

			stv090x_write_reg(state, STV090x_TSGENERAL, 0x0c);

			break;

		}

	} else {

		switch (state->config->ts1_mode) {

		case STV090x_TSMODE_PARALLEL_PUNCTURED:

		case STV090x_TSMODE_DVBCI:

			stv090x_write_reg(state, STV090x_TSGENERAL1X, 0x10);

			break;



		case STV090x_TSMODE_SERIAL_PUNCTURED:

		case STV090x_TSMODE_SERIAL_CONTINUOUS:

		default:

			stv090x_write_reg(state, STV090x_TSGENERAL1X, 0x14);

			break;

		}

	}



	switch (state->config->ts1_mode) {

	case STV090x_TSMODE_PARALLEL_PUNCTURED:

		reg = stv090x_read_reg(state, STV090x_P1_TSCFGH);

		STV090x_SETFIELD_Px(reg, TSFIFO_SERIAL_FIELD, 0x00);

		STV090x_SETFIELD_Px(reg, TSFIFO_DVBCI_FIELD, 0x00);

		if (stv090x_write_reg(state, STV090x_P1_TSCFGH, reg) < 0)

			goto err;

		break;



	case STV090x_TSMODE_DVBCI:

		reg = stv090x_read_reg(state, STV090x_P1_TSCFGH);

		STV090x_SETFIELD_Px(reg, TSFIFO_SERIAL_FIELD, 0x00);

		STV090x_SETFIELD_Px(reg, TSFIFO_DVBCI_FIELD, 0x01);

		if (stv090x_write_reg(state, STV090x_P1_TSCFGH, reg) < 0)

			goto err;

		break;



	case STV090x_TSMODE_SERIAL_PUNCTURED:

		reg = stv090x_read_reg(state, STV090x_P1_TSCFGH);

		STV090x_SETFIELD_Px(reg, TSFIFO_SERIAL_FIELD, 0x01);

		STV090x_SETFIELD_Px(reg, TSFIFO_DVBCI_FIELD, 0x00);

		if (stv090x_write_reg(state, STV090x_P1_TSCFGH, reg) < 0)

			goto err;

		break;



	case STV090x_TSMODE_SERIAL_CONTINUOUS:

		reg = stv090x_read_reg(state, STV090x_P1_TSCFGH);

		STV090x_SETFIELD_Px(reg, TSFIFO_SERIAL_FIELD, 0x01);

		STV090x_SETFIELD_Px(reg, TSFIFO_DVBCI_FIELD, 0x01);

		if (stv090x_write_reg(state, STV090x_P1_TSCFGH, reg) < 0)

			goto err;

		break;



	default:

		break;

	}



	if (state->config->ts1_clk > 0) {

		u32 speed;



		switch (state->config->ts1_mode) {

		case STV090x_TSMODE_PARALLEL_PUNCTURED:

		case STV090x_TSMODE_DVBCI:

		default:

			speed = state->internal->mclk /

				(state->config->ts1_clk / 4);

			if (speed < 0x08)

				speed = 0x08;

			if (speed > 0xFF)

				speed = 0xFF;

			break;

		case STV090x_TSMODE_SERIAL_PUNCTURED:

		case STV090x_TSMODE_SERIAL_CONTINUOUS:

			speed = state->internal->mclk /

				(state->config->ts1_clk / 32);

			if (speed < 0x20)

				speed = 0x20;

			if (speed > 0xFF)

				speed = 0xFF;

			break;

		}

		reg = stv090x_read_reg(state, STV090x_P1_TSCFGM);

		STV090x_SETFIELD_Px(reg, TSFIFO_MANSPEED_FIELD, 3);

		if (stv090x_write_reg(state, STV090x_P1_TSCFGM, reg) < 0)

			goto err;

		if (stv090x_write_reg(state, STV090x_P1_TSSPEED, speed) < 0)

			goto err;

	}



	reg = stv090x_read_reg(state, STV090x_P1_TSCFGH);

	STV090x_SETFIELD_Px(reg, RST_HWARE_FIELD, 0x01);

	if (stv090x_write_reg(state, STV090x_P1_TSCFGH, reg) < 0)

		goto err;

	STV090x_SETFIELD_Px(reg, RST_HWARE_FIELD, 0x00);

	if (stv090x_write_reg(state, STV090x_P1_TSCFGH, reg) < 0)

		goto err;



	return 0;

err:

	dprintk(FE_ERROR, 1, "I/O error");

	return -1;

}



static int stv090x_init(struct dvb_frontend *fe)

{

	struct stv090x_state *state = fe->demodulator_priv;
@@ -4600,8 +4715,13 @@ static int stv090x_init(struct dvb_frontend *fe) 
	if (stv090x_i2c_gate_ctrl(state, 0) < 0)

		goto err;



	if (stv090x_set_tspath(state) < 0)

	if (state->device == STV0900) {

		if (stv0900_set_tspath(state) < 0)

			goto err;

	} else {

		if (stv0903_set_tspath(state) < 0)

			goto err;

	}



	return 0;
@@ -4642,6 +4762,7 @@ static int stv090x_setup(struct dvb_frontend *fe) 
	/* Stop Demod */

	if (stv090x_write_reg(state, STV090x_P1_DMDISTATE, 0x5c) < 0)

		goto err;

	if (state->device == STV0900)

		if (stv090x_write_reg(state, STV090x_P2_DMDISTATE, 0x5c) < 0)

			goto err;
@@ -4650,6 +4771,7 @@ static int stv090x_setup(struct dvb_frontend *fe) 
	/* Set No Tuner Mode */

	if (stv090x_write_reg(state, STV090x_P1_TNRCFG, 0x6c) < 0)

		goto err;

	if (state->device == STV0900)

		if (stv090x_write_reg(state, STV090x_P2_TNRCFG, 0x6c) < 0)

			goto err;
@@ -4657,6 +4779,7 @@ static int stv090x_setup(struct dvb_frontend *fe) 
	STV090x_SETFIELD_Px(reg, ENARPT_LEVEL_FIELD, config->repeater_level);

	if (stv090x_write_reg(state, STV090x_P1_I2CRPT, reg) < 0)

		goto err;

	if (state->device == STV0900)

		if (stv090x_write_reg(state, STV090x_P2_I2CRPT, reg) < 0)

			goto err;