Skip to content

Commit

Permalink
i2c: cros_ec: Remove EC_I2C_FLAG_10BIT
Browse files Browse the repository at this point in the history
In <https://lkml.org/lkml/2014/6/10/265> pointed out that the 10-bit
flag in the cros_ec_tunnel was useless.  It went into a 16-bit flags
field but was defined at (1 << 16).

Since we have no 10-bit i2c devices on the other side of the tunnel on
any known devices this was never a problem.  Until we do it makes
sense to remove this code.  On the EC side the code to handle this
flag was removed in <https://chromium-review.googlesource.com/204162>.

Reported-by: Dave Jones <davej@redhat.com>
Signed-off-by: Doug Anderson <dianders@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  • Loading branch information
Doug Anderson authored and Wolfram Sang committed Sep 30, 2014
1 parent 6c97c9c commit d8e0a86
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
6 changes: 4 additions & 2 deletions drivers/i2c/busses/i2c-cros-ec-tunnel.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ static int ec_i2c_construct_message(u8 *buf, const struct i2c_msg i2c_msgs[],
msg->addr_flags = i2c_msg->addr;

if (i2c_msg->flags & I2C_M_TEN)
msg->addr_flags |= EC_I2C_FLAG_10BIT;
return -EINVAL;

if (i2c_msg->flags & I2C_M_RD) {
msg->addr_flags |= EC_I2C_FLAG_READ;
Expand Down Expand Up @@ -218,7 +218,9 @@ static int ec_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg i2c_msgs[],
}
}

ec_i2c_construct_message(request, i2c_msgs, num, bus_num);
result = ec_i2c_construct_message(request, i2c_msgs, num, bus_num);
if (result)
goto exit;

msg.version = 0;
msg.command = EC_CMD_I2C_PASSTHRU;
Expand Down
3 changes: 0 additions & 3 deletions include/linux/mfd/cros_ec_commands.h
Original file line number Diff line number Diff line change
Expand Up @@ -1928,9 +1928,6 @@ struct ec_response_power_info {

#define EC_CMD_I2C_PASSTHRU 0x9e

/* Slave address is 10 (not 7) bit */
#define EC_I2C_FLAG_10BIT (1 << 16)

/* Read data; if not present, message is a write */
#define EC_I2C_FLAG_READ (1 << 15)

Expand Down

0 comments on commit d8e0a86

Please sign in to comment.