diff options
| author | Tom Rini <trini@ti.com> | 2015-02-13 13:11:09 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-13 13:11:09 -0500 |
| commit | 757566d1567a98f5c331c14f088001dbfe187191 (patch) | |
| tree | 86c9ab53fbefee672f37165f51db398338bf9968 /drivers/i2c/mv_i2c.c | |
| parent | c445506d73a0fba6472d12510b2d41148f078349 (diff) | |
| parent | b1f6659c420dae9cd06514fbd8342f39b3f326b9 (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/i2c/mv_i2c.c')
| -rw-r--r-- | drivers/i2c/mv_i2c.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/i2c/mv_i2c.c b/drivers/i2c/mv_i2c.c index dac346334d8..e65cce0d8e7 100644 --- a/drivers/i2c/mv_i2c.c +++ b/drivers/i2c/mv_i2c.c @@ -31,7 +31,7 @@ #endif /* All transfers are described by this data structure */ -struct i2c_msg { +struct mv_i2c_msg { u8 condition; u8 acknack; u8 direction; @@ -157,7 +157,7 @@ static int i2c_isr_set_cleared(unsigned long set_mask, * -5: illegal parameters * -6: bus is busy and couldn't be aquired */ -int i2c_transfer(struct i2c_msg *msg) +int i2c_transfer(struct mv_i2c_msg *msg) { int ret; @@ -286,7 +286,7 @@ void i2c_init(int speed, int slaveaddr) */ int i2c_probe(uchar chip) { - struct i2c_msg msg; + struct mv_i2c_msg msg; i2c_reset(); @@ -322,7 +322,7 @@ int i2c_probe(uchar chip) */ int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len) { - struct i2c_msg msg; + struct mv_i2c_msg msg; u8 addr_bytes[3]; /* lowest...highest byte of data address */ PRINTD(("i2c_read(chip=0x%02x, addr=0x%02x, alen=0x%02x, " @@ -410,7 +410,7 @@ int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len) */ int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len) { - struct i2c_msg msg; + struct mv_i2c_msg msg; u8 addr_bytes[3]; /* lowest...highest byte of data address */ PRINTD(("i2c_write(chip=0x%02x, addr=0x%02x, alen=0x%02x, " |