projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dm: power: Add a new driver for the TPS65090 PMIC
[oweals/u-boot.git]
/
drivers
/
i2c
/
mv_i2c.c
diff --git
a/drivers/i2c/mv_i2c.c
b/drivers/i2c/mv_i2c.c
index dac346334d8100f46b90e18eb82a6b74eff8b100..fc02e65504bfc698a4cbc021f624fba28a5fe90a 100644
(file)
--- 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 */
#endif
/* All transfers are described by this data structure */
-struct i2c_msg {
+struct
mv_
i2c_msg {
u8 condition;
u8 acknack;
u8 direction;
u8 condition;
u8 acknack;
u8 direction;
@@
-73,7
+73,7
@@
static void i2c_board_init(struct mv_i2c *base)
}
#ifdef CONFIG_I2C_MULTI_BUS
}
#ifdef CONFIG_I2C_MULTI_BUS
-static u
32
i2c_regs[CONFIG_MV_I2C_NUM] = CONFIG_MV_I2C_REG;
+static u
nsigned long
i2c_regs[CONFIG_MV_I2C_NUM] = CONFIG_MV_I2C_REG;
static unsigned int bus_initialized[CONFIG_MV_I2C_NUM];
static unsigned int current_bus;
static unsigned int bus_initialized[CONFIG_MV_I2C_NUM];
static unsigned int current_bus;
@@
-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
*/
* -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;
{
int ret;
@@
-286,7
+286,7
@@
void i2c_init(int speed, int slaveaddr)
*/
int i2c_probe(uchar chip)
{
*/
int i2c_probe(uchar chip)
{
- struct i2c_msg msg;
+ struct
mv_
i2c_msg msg;
i2c_reset();
i2c_reset();
@@
-322,7
+322,7
@@
int i2c_probe(uchar chip)
*/
int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len)
{
*/
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, "
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)
{
*/
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, "
u8 addr_bytes[3]; /* lowest...highest byte of data address */
PRINTD(("i2c_write(chip=0x%02x, addr=0x%02x, alen=0x%02x, "