diff options
author | Jean Delvare <khali@linux-fr.org> | 2009-12-06 11:06:22 -0500 |
---|---|---|
committer | Jean Delvare <khali@linux-fr.org> | 2009-12-06 11:06:22 -0500 |
commit | da44bdeb95ea75eec263f42f7703bbf14f004f6a (patch) | |
tree | 4ef557995fff162e4aef114fcd5959956b050ef6 /drivers/i2c | |
parent | 194684e596af4bdaebb424166d94a8aa528edfda (diff) |
i2c: Bus drivers don't have to support I2C_M_REV_DIR_ADDR
I2C bus drivers don't have to support I2C_M_REV_DIR_ADDR. It is a
deviation from the I2C specification, which only makes sense to
implement when really needed.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/busses/i2c-iop3xx.c | 6 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-mv64xxx.c | 3 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-powermac.c | 2 |
3 files changed, 0 insertions, 11 deletions
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c index a75c75e77b92..5901707fc66a 100644 --- a/drivers/i2c/busses/i2c-iop3xx.c +++ b/drivers/i2c/busses/i2c-iop3xx.c | |||
@@ -56,12 +56,6 @@ iic_cook_addr(struct i2c_msg *msg) | |||
56 | if (msg->flags & I2C_M_RD) | 56 | if (msg->flags & I2C_M_RD) |
57 | addr |= 1; | 57 | addr |= 1; |
58 | 58 | ||
59 | /* | ||
60 | * Read or Write? | ||
61 | */ | ||
62 | if (msg->flags & I2C_M_REV_DIR_ADDR) | ||
63 | addr ^= 1; | ||
64 | |||
65 | return addr; | 59 | return addr; |
66 | } | 60 | } |
67 | 61 | ||
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index bbab0e166630..ed387ffa4730 100644 --- a/drivers/i2c/busses/i2c-mv64xxx.c +++ b/drivers/i2c/busses/i2c-mv64xxx.c | |||
@@ -338,9 +338,6 @@ mv64xxx_i2c_prepare_for_io(struct mv64xxx_i2c_data *drv_data, | |||
338 | if (msg->flags & I2C_M_RD) | 338 | if (msg->flags & I2C_M_RD) |
339 | dir = 1; | 339 | dir = 1; |
340 | 340 | ||
341 | if (msg->flags & I2C_M_REV_DIR_ADDR) | ||
342 | dir ^= 1; | ||
343 | |||
344 | if (msg->flags & I2C_M_TEN) { | 341 | if (msg->flags & I2C_M_TEN) { |
345 | drv_data->addr1 = 0xf0 | (((u32)msg->addr & 0x300) >> 7) | dir; | 342 | drv_data->addr1 = 0xf0 | (((u32)msg->addr & 0x300) >> 7) | dir; |
346 | drv_data->addr2 = (u32)msg->addr & 0xff; | 343 | drv_data->addr2 = (u32)msg->addr & 0xff; |
diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c index 02b02413850a..1c440a70ec61 100644 --- a/drivers/i2c/busses/i2c-powermac.c +++ b/drivers/i2c/busses/i2c-powermac.c | |||
@@ -162,8 +162,6 @@ static int i2c_powermac_master_xfer( struct i2c_adapter *adap, | |||
162 | return -EINVAL; | 162 | return -EINVAL; |
163 | read = (msgs->flags & I2C_M_RD) != 0; | 163 | read = (msgs->flags & I2C_M_RD) != 0; |
164 | addrdir = (msgs->addr << 1) | read; | 164 | addrdir = (msgs->addr << 1) | read; |
165 | if (msgs->flags & I2C_M_REV_DIR_ADDR) | ||
166 | addrdir ^= 1; | ||
167 | 165 | ||
168 | rc = pmac_i2c_open(bus, 0); | 166 | rc = pmac_i2c_open(bus, 0); |
169 | if (rc) { | 167 | if (rc) { |