diff options
| author | Troy Kisky <troy.kisky@boundarydevices.com> | 2012-07-19 08:18:14 +0000 |
|---|---|---|
| committer | Heiko Schocher <hs@denx.de> | 2012-07-31 07:52:53 +0200 |
| commit | ca741da106de2b3d1432a333b3da0af6849c4e9a (patch) | |
| tree | 66bc9df033b1a6b11a6000743db82991d3e91e01 /drivers | |
| parent | 90a5b70f5914a3ac79cac3dd386cc98ce42bfd8e (diff) | |
| download | blackbird-obmc-uboot-ca741da106de2b3d1432a333b3da0af6849c4e9a.tar.gz blackbird-obmc-uboot-ca741da106de2b3d1432a333b3da0af6849c4e9a.zip | |
mxc_i2c: change slave addr if conflicts with destination.
The i2c controller cannot be both master and slave in the
same transaction.
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/mxc_i2c.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index 1a5e379c2f..ba2aad3d0d 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -223,6 +223,8 @@ static int i2c_init_transfer(struct mxc_i2c_regs *i2c_regs, /* Wait for controller to be stable */ udelay(50); } + if (readb(&i2c_regs->iadr) == (chip << 1)) + writeb((chip << 1) ^ 2, &i2c_regs->iadr); writeb(0, &i2c_regs->i2sr); ret = wait_for_sr_state(i2c_regs, ST_BUS_IDLE); if (ret < 0) |
