Commit 9e422f64 authored by Stefan Pöschel's avatar Stefan Pöschel Committed by Mauro Carvalho Chehab
Browse files

[media] af9035: fix dual tuner detection with PCTV 79e 



The value 5 of the EEPROM_TS_MODE register (meaning dual tuner presence) is
only valid for AF9035 devices. For IT9135 devices it is invalid and led to a
false positive dual tuner mode detection with PCTV 79e.
Therefore on non-AF9035 devices and with value 5 the driver now defaults to
single tuner mode and outputs a regarding info message to log.

This fixes Bugzilla bug #118561.

Reported-by: default avatarMarc Duponcheel <marc@offline.be>
Signed-off-by: default avatarStefan Pöschel <basic.master@gmx.de>
Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 5cac1f67

drivers/media/usb/dvb-usb-v2/af9035.c

+33 −17
Original line number Diff line number Diff line
@@ -496,7 +496,8 @@ static int af9035_identify_state(struct dvb_usb_device *d, const char **name) 
{

	struct state *state = d_to_priv(d);

	struct usb_interface *intf = d->intf;

	int ret;

	int ret, ts_mode_invalid;

	u8 tmp;

	u8 wbuf[1] = { 1 };

	u8 rbuf[4];

	struct usb_req req = { CMD_FW_QUERYINFO, 0, sizeof(wbuf), wbuf,
@@ -530,6 +531,36 @@ static int af9035_identify_state(struct dvb_usb_device *d, const char **name) 
		state->eeprom_addr = EEPROM_BASE_AF9035;

	}





	/* check for dual tuner mode */

	ret = af9035_rd_reg(d, state->eeprom_addr + EEPROM_TS_MODE, &tmp);

	if (ret < 0)

		goto err;



	ts_mode_invalid = 0;

	switch (tmp) {

	case 0:

		break;

	case 1:

	case 3:

		state->dual_mode = true;

		break;

	case 5:

		if (state->chip_type != 0x9135 && state->chip_type != 0x9306)

			state->dual_mode = true;	/* AF9035 */

		else

			ts_mode_invalid = 1;

		break;

	default:

		ts_mode_invalid = 1;

	}



	dev_dbg(&intf->dev, "ts mode=%d dual mode=%d\n", tmp, state->dual_mode);



	if (ts_mode_invalid)

		dev_info(&intf->dev, "ts mode=%d not supported, defaulting to single tuner mode!", tmp);





	ret = af9035_ctrl_msg(d, &req);

	if (ret < 0)

		goto err;
@@ -698,11 +729,7 @@ static int af9035_download_firmware(struct dvb_usb_device *d, 
	 * which is done by master demod.

	 * Master feeds also clock and controls power via GPIO.

	 */

	ret = af9035_rd_reg(d, state->eeprom_addr + EEPROM_TS_MODE, &tmp);

	if (ret < 0)

		goto err;



	if (tmp == 1 || tmp == 3 || tmp == 5) {

	if (state->dual_mode) {

		/* configure gpioh1, reset & power slave demod */

		ret = af9035_wr_reg_mask(d, 0x00d8b0, 0x01, 0x01);

		if (ret < 0)
@@ -835,17 +862,6 @@ static int af9035_read_config(struct dvb_usb_device *d) 
	}







	/* check if there is dual tuners */

	ret = af9035_rd_reg(d, state->eeprom_addr + EEPROM_TS_MODE, &tmp);

	if (ret < 0)

		goto err;



	if (tmp == 1 || tmp == 3 || tmp == 5)

		state->dual_mode = true;



	dev_dbg(&intf->dev, "ts mode=%d dual mode=%d\n", tmp, state->dual_mode);



	if (state->dual_mode) {

		/* read 2nd demodulator I2C address */

		ret = af9035_rd_reg(d,

drivers/media/usb/dvb-usb-v2/af9035.h

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static const u32 clock_lut_it9135[] = { 
 * 0  TS

 * 1  DCA + PIP

 * 3  PIP

 * 5  DCA + PIP

 * 5  DCA + PIP (AF9035 only)

 * n  DCA

 *

 * Values 0, 3 and 5 are seen to this day. 0 for single TS and 3/5 for dual TS.

CRA Git | Maintained and supported by SUSTech CRA and CCSE