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

Commit 2a15ac7a authored by Dmitri Belimov's avatar Dmitri Belimov Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: tm6000, reset I2C bus function 



Add new function for reset I2C bus. Rework some code for use this function.

Signed-off-by: default avatarBeholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b9eb39d8

drivers/staging/tm6000/tm6000-cards.c

+2 −15
Original line number Diff line number Diff line
@@ -363,13 +363,7 @@ int tm6000_tuner_callback(void *ptr, int component, int command, int arg) 
		tm6000_set_reg(dev, REQ_04_EN_DISABLE_MCU_INT,

					0x02, arg);

		msleep(10);

		rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,

					TM6000_GPIO_CLK, 0);

		if (rc < 0)

			return rc;

		msleep(10);

		rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,

					TM6000_GPIO_CLK, 1);

		rc = tm6000_i2c_reset(dev, 10);

		break;

	case XC2028_TUNER_RESET:

		/* Reset codes during load firmware */
@@ -423,14 +417,7 @@ int tm6000_tuner_callback(void *ptr, int component, int command, int arg) 
			break;



		case 2:

			rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,

						TM6000_GPIO_CLK, 0);

			if (rc < 0)

				return rc;

			msleep(100);

			rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,

						TM6000_GPIO_CLK, 1);

			msleep(100);

			rc = tm6000_i2c_reset(dev, 100);

			break;

		}

	}

drivers/staging/tm6000/tm6000-core.c

+16 −0
Original line number Diff line number Diff line
@@ -153,6 +153,22 @@ int tm6000_get_reg32 (struct tm6000_core *dev, u8 req, u16 value, u16 index) 
	return buf[3] | buf[2] << 8 | buf[1] << 16 | buf[0] << 24;

}



int tm6000_i2c_reset(struct tm6000_core *dev, u16 tsleep)

{

	int rc;



	rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, TM6000_GPIO_CLK, 0);

	if (rc < 0)

		return rc;



	msleep(tsleep);



	rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, TM6000_GPIO_CLK, 1);

	msleep(tsleep);



	return rc;

}



void tm6000_set_fourcc_format(struct tm6000_core *dev)

{

	if (dev->dev_type == TM6010) {

drivers/staging/tm6000/tm6000.h

+2 −0
Original line number Diff line number Diff line
@@ -246,6 +246,8 @@ int tm6000_get_reg (struct tm6000_core *dev, u8 req, u16 value, u16 index); 
int tm6000_get_reg16(struct tm6000_core *dev, u8 req, u16 value, u16 index);

int tm6000_get_reg32(struct tm6000_core *dev, u8 req, u16 value, u16 index);

int tm6000_set_reg (struct tm6000_core *dev, u8 req, u16 value, u16 index);

int tm6000_i2c_reset(struct tm6000_core *dev, u16 tsleep);



int tm6000_init (struct tm6000_core *dev);



int tm6000_init_analog_mode (struct tm6000_core *dev);