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

Commit 14992f01 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

[media] af9035: use default i2c slave address for af9035 too 



Some device vendors has forgotten set correct slave demod I2C address
to eeprom. Use default I2C address when eeprom has no address at all.

Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 37973e01

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

+7 −8
Original line number Diff line number Diff line
@@ -575,11 +575,11 @@ static int af9035_download_firmware(struct dvb_usb_device *d, 
		if (ret < 0)

			goto err;



		if (state->chip_type == 0x9135) {

		/* use default I2C address if eeprom has no address set */

		if (!tmp)

				/* default 0x9135 slave I2C address */

			tmp = 0x3a;



		if (state->chip_type == 0x9135) {

			ret = af9035_wr_reg(d, 0x004bfb, tmp);

			if (ret < 0)

				goto err;
@@ -641,6 +641,7 @@ static int af9035_read_config(struct dvb_usb_device *d) 


	/* demod I2C "address" */

	state->af9033_config[0].i2c_addr = 0x38;

	state->af9033_config[1].i2c_addr = 0x3a;

	state->af9033_config[0].adc_multiplier = AF9033_ADC_MULTIPLIER_2X;

	state->af9033_config[1].adc_multiplier = AF9033_ADC_MULTIPLIER_2X;

	state->af9033_config[0].ts_mode = AF9033_TS_MODE_USB;
@@ -688,11 +689,9 @@ static int af9035_read_config(struct dvb_usb_device *d) 
		if (ret < 0)

			goto err;



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

			/* default 0x9135 slave I2C address */

			tmp = 0x3a;



		if (tmp)

			state->af9033_config[1].i2c_addr = tmp;



		dev_dbg(&d->udev->dev, "%s: 2nd demod I2C addr=%02x\n",

				__func__, tmp);

	}