diff mbox

[09/11] zl10353: tm6000: bugfix reading problems with tm6000 i2c host

Message ID 1266255444-7422-9-git-send-email-stefan.ringel@arcor.de (mailing list archive)
State Superseded, archived
Headers

Commit Message

Stefan Ringel Feb. 15, 2010, 5:37 p.m. UTC 
  From: Stefan Ringel <stefan.ringel@arcor.de>

Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de>

Comments

Mauro Carvalho Chehab Feb. 18, 2010, 8:20 p.m. UTC | #1 
stefan.ringel@arcor.de wrote:
> From: Stefan Ringel <stefan.ringel@arcor.de>
> 
> Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de>
> 
> diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
> index 8c61271..9716d7e 100644
> --- a/drivers/media/dvb/frontends/zl10353.c
> +++ b/drivers/media/dvb/frontends/zl10353.c
> @@ -74,7 +74,7 @@ static int zl10353_write(struct dvb_frontend *fe, u8 *ibuf, int ilen)
>  	return 0;
>  }
>  
> -static int zl10353_read_register(struct zl10353_state *state, u8 reg)
> +static int zl10353_read1_register(struct zl10353_state *state, u8 reg)
>  {
>  	int ret;
>  	u8 b0[1] = { reg };
> @@ -97,6 +97,41 @@ static int zl10353_read_register(struct zl10353_state *state, u8 reg)
>  	return b1[0];
>  }
>  
> +static int zl10353_read2_register(struct zl10353_state *state, u8 reg)
> +{
> +	int ret;
> +	u8 b0[1] = { reg - 1 };
> +	u8 b1[1] = { 0 };
> +	struct i2c_msg msg[2] = { { .addr = state->config.demod_address,
> +				    .flags = 0,
> +				    .buf = b0, .len = 1 },
> +				  { .addr = state->config.demod_address,
> +				    .flags = I2C_M_RD,
> +				    .buf = b1, .len = 2 } };
> +
> +	ret = i2c_transfer(state->i2c, msg, 2);
> +
> +	if (ret != 2) {
> +		printk("%s: readreg error (reg=%d, ret==%i)\n",
> +		       __func__, reg, ret);
> +		return ret;
> +	}
> +
> +	return b1[1];
> +}

This patch doesn't look correct to me. The size of the zl10353 read register doesn't 
change when it is used with tm6000. The solution should be at tm6000-i2c, basically
using the same REQ for 2 bytes when only 1 byte is being read.

Cheers,
Mauro
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
index 8c61271..9716d7e 100644
--- a/drivers/media/dvb/frontends/zl10353.c
+++ b/drivers/media/dvb/frontends/zl10353.c
@@ -74,7 +74,7 @@  static int zl10353_write(struct dvb_frontend *fe, u8 *ibuf, int ilen)
 	return 0;
 }
 
-static int zl10353_read_register(struct zl10353_state *state, u8 reg)
+static int zl10353_read1_register(struct zl10353_state *state, u8 reg)
 {
 	int ret;
 	u8 b0[1] = { reg };
@@ -97,6 +97,41 @@  static int zl10353_read_register(struct zl10353_state *state, u8 reg)
 	return b1[0];
 }
 
+static int zl10353_read2_register(struct zl10353_state *state, u8 reg)
+{
+	int ret;
+	u8 b0[1] = { reg - 1 };
+	u8 b1[1] = { 0 };
+	struct i2c_msg msg[2] = { { .addr = state->config.demod_address,
+				    .flags = 0,
+				    .buf = b0, .len = 1 },
+				  { .addr = state->config.demod_address,
+				    .flags = I2C_M_RD,
+				    .buf = b1, .len = 2 } };
+
+	ret = i2c_transfer(state->i2c, msg, 2);
+
+	if (ret != 2) {
+		printk("%s: readreg error (reg=%d, ret==%i)\n",
+		       __func__, reg, ret);
+		return ret;
+	}
+
+	return b1[1];
+}
+
+static int zl10353_read_register(struct zl10353_state *state, u8 reg)
+{
+	int ret;
+
+	if ((state->i2c->id == I2C_HW_B_TM6000) && (reg % 2 == 0))
+		ret = zl10353_read2_register(state, reg);
+	else
+		ret = zl10353_read1_register(state, reg);
+
+	return ret;
+}
+
 static void zl10353_dump_regs(struct dvb_frontend *fe)
 {
 	struct zl10353_state *state = fe->demodulator_priv;