summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorNishanth Menon <nm@ti.com>2013-03-26 05:20:50 +0000
committerTom Rini <trini@ti.com>2013-05-10 08:25:54 -0400
commitb29c2f0c142fdb8ef50deae1cc7c4338952fba6c (patch)
tree18c1e5243a86295c277a88b79cd96c36546694d0 /drivers
parent0208aaf6c2e0f346e8410c0e5adb0ea784f00829 (diff)
downloadu-boot-imx-b29c2f0c142fdb8ef50deae1cc7c4338952fba6c.zip
u-boot-imx-b29c2f0c142fdb8ef50deae1cc7c4338952fba6c.tar.gz
u-boot-imx-b29c2f0c142fdb8ef50deae1cc7c4338952fba6c.tar.bz2
twl4030: make twl4030_i2c_read_u8 prototype consistent
u-boot standard i2c read prototype is i2c_read(addr, reg, 1, &buf, 1) twl4030_i2c_read_u8(u8 addr, u8 *val, u8 reg) does not provide consistency, so switch the prototype to be consistent with rest of u-boot i2c operations: twl4030_i2c_read_u8(u8 addr, u8 reg, u8 *val) Signed-off-by: Nishanth Menon <nm@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/power/twl4030.c4
-rw-r--r--drivers/usb/phy/twl4030.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/twl4030.c b/drivers/power/twl4030.c
index 2bf94b1..6610f78 100644
--- a/drivers/power/twl4030.c
+++ b/drivers/power/twl4030.c
@@ -45,8 +45,8 @@
void twl4030_power_reset_init(void)
{
u8 val = 0;
- if (twl4030_i2c_read_u8(TWL4030_CHIP_PM_MASTER, &val,
- TWL4030_PM_MASTER_P1_SW_EVENTS)) {
+ if (twl4030_i2c_read_u8(TWL4030_CHIP_PM_MASTER,
+ TWL4030_PM_MASTER_P1_SW_EVENTS, &val)) {
printf("Error:TWL4030: failed to read the power register\n");
printf("Could not initialize hardware reset\n");
} else {
diff --git a/drivers/usb/phy/twl4030.c b/drivers/usb/phy/twl4030.c
index f41cc07..74f1dcc 100644
--- a/drivers/usb/phy/twl4030.c
+++ b/drivers/usb/phy/twl4030.c
@@ -66,7 +66,7 @@ static int twl4030_usb_read(u8 address)
u8 data;
int ret;
- ret = twl4030_i2c_read_u8(TWL4030_CHIP_USB, &data, address);
+ ret = twl4030_i2c_read_u8(TWL4030_CHIP_USB, address, &data);
if (ret == 0)
ret = data;
else