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

Commit 4743319f authored by Dmitri Belimov's avatar Dmitri Belimov Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: xc5000, rework xc_write_reg 



Rework xc_write_reg function for correct read register of the xc5000.
It is very useful for tm6000.

Tested for tm6000 and for saa7134 works well.

Signed-off-by: default avatarBeholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com>
Acked-by: default avatarDevin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent e252984c

drivers/media/common/tuners/xc5000.c

+26 −31
Original line number Diff line number Diff line
@@ -232,6 +232,26 @@ static int xc_read_i2c_data(struct xc5000_priv *priv, u8 *buf, int len) 
	return 0;

}



static int xc5000_readreg(struct xc5000_priv *priv, u16 reg, u16 *val)

{

	u8 buf[2] = { reg >> 8, reg & 0xff };

	u8 bval[2] = { 0, 0 };

	struct i2c_msg msg[2] = {

		{ .addr = priv->i2c_props.addr,

			.flags = 0, .buf = &buf[0], .len = 2 },

		{ .addr = priv->i2c_props.addr,

			.flags = I2C_M_RD, .buf = &bval[0], .len = 2 },

	};



	if (i2c_transfer(priv->i2c_props.adap, msg, 2) != 2) {

		printk(KERN_WARNING "xc5000: I2C read failed\n");

		return -EREMOTEIO;

	}



	*val = (bval[0] << 8) | bval[1];

	return XC_RESULT_SUCCESS;

}



static void xc_wait(int wait_ms)

{

	msleep(wait_ms);
@@ -275,12 +295,7 @@ static int xc_write_reg(struct xc5000_priv *priv, u16 regAddr, u16 i2cData) 
	if (result == XC_RESULT_SUCCESS) {

		/* wait for busy flag to clear */

		while ((WatchDogTimer > 0) && (result == XC_RESULT_SUCCESS)) {

			buf[0] = 0;

			buf[1] = XREG_BUSY;



			result = xc_send_i2c_data(priv, buf, 2);

			if (result == XC_RESULT_SUCCESS) {

				result = xc_read_i2c_data(priv, buf, 2);

			result = xc5000_readreg(priv, XREG_BUSY, buf);

			if (result == XC_RESULT_SUCCESS) {

				if ((buf[0] == 0) && (buf[1] == 0)) {

					/* busy flag cleared */
@@ -292,7 +307,6 @@ static int xc_write_reg(struct xc5000_priv *priv, u16 regAddr, u16 i2cData) 
			}

		}

	}

	}

	if (WatchDogTimer < 0)

		result = XC_RESULT_I2C_WRITE_FAILURE;
@@ -526,25 +540,6 @@ static int xc_tune_channel(struct xc5000_priv *priv, u32 freq_hz, int mode) 
	return found;

}



static int xc5000_readreg(struct xc5000_priv *priv, u16 reg, u16 *val)

{

	u8 buf[2] = { reg >> 8, reg & 0xff };

	u8 bval[2] = { 0, 0 };

	struct i2c_msg msg[2] = {

		{ .addr = priv->i2c_props.addr,

			.flags = 0, .buf = &buf[0], .len = 2 },

		{ .addr = priv->i2c_props.addr,

			.flags = I2C_M_RD, .buf = &bval[0], .len = 2 },

	};



	if (i2c_transfer(priv->i2c_props.adap, msg, 2) != 2) {

		printk(KERN_WARNING "xc5000: I2C read failed\n");

		return -EREMOTEIO;

	}



	*val = (bval[0] << 8) | bval[1];

	return XC_RESULT_SUCCESS;

}



static int xc5000_fwupload(struct dvb_frontend *fe)

{