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>

diff --git a/board/cm_t35/cm_t35.c b/board/cm_t35/cm_t35.c
index 87d73546a2fd96f414c7fdc5ae918723c622ae82..85286809d3d128a35913bfa9cb6b97ffd5e965fc 100644 (file)
--- a/board/cm_t35/cm_t35.c
+++ b/board/cm_t35/cm_t35.c
@@ -448,7 +448,7 @@ int board_mmc_getcd(struct mmc *mmc)
 {
        u8 val;
 
-       if (twl4030_i2c_read_u8(TWL4030_CHIP_GPIO, &val, TWL4030_BASEADD_GPIO))
+       if (twl4030_i2c_read_u8(TWL4030_CHIP_GPIO, TWL4030_BASEADD_GPIO, &val))
                return -1;
 
        return !(val & 1);
@@ -597,7 +597,7 @@ int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
        udelay(1000);
 
        offset = TWL4030_BASEADD_GPIO + TWL4030_GPIO_GPIODATADIR1;
-       twl4030_i2c_read_u8(TWL4030_CHIP_GPIO, &val, offset);
+       twl4030_i2c_read_u8(TWL4030_CHIP_GPIO, offset, &val);
        /* Set GPIO6 and GPIO7 of TPS65930 as output */
        val |= 0xC0;
        twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, offset, val);

diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
index 860d52da3f141aa9b7e7555098c957182200633c..42bf8b669d74c24563706598476701cde39fe5bf 100644 (file)
--- a/board/nokia/rx51/rx51.c
+++ b/board/nokia/rx51/rx51.c
@@ -406,8 +406,8 @@ int misc_init_r(void)
                                TWL4030_PM_RECEIVER_DEV_GRP_P1);
 
        /* store I2C access state */
-       twl4030_i2c_read_u8(TWL4030_CHIP_PM_MASTER, &state,
-                       TWL4030_PM_MASTER_PB_CFG);
+       twl4030_i2c_read_u8(TWL4030_CHIP_PM_MASTER, TWL4030_PM_MASTER_PB_CFG,
+                           &state);
 
        /* enable I2C access to powerbus (needed for twl4030 regulator) */
        twl4030_i2c_write_u8(TWL4030_CHIP_PM_MASTER, TWL4030_PM_MASTER_PB_CFG,
@@ -475,8 +475,8 @@ void hw_watchdog_reset(void)
                return;
 
        /* read actual watchdog timeout */
-       twl4030_i2c_read_u8(TWL4030_CHIP_PM_RECEIVER, &timeout,
-                       TWL4030_PM_RECEIVER_WATCHDOG_CFG);
+       twl4030_i2c_read_u8(TWL4030_CHIP_PM_RECEIVER,
+                           TWL4030_PM_RECEIVER_WATCHDOG_CFG, &timeout);
 
        /* timeout 0 means watchdog is disabled */
        /* reset watchdog timeout to 31s (maximum) */
@@ -531,8 +531,8 @@ int rx51_kp_init(void)
 {
        int ret = 0;
        u8 ctrl;
-       ret = twl4030_i2c_read_u8(TWL4030_CHIP_KEYPAD, &ctrl,
-               TWL4030_KEYPAD_KEYP_CTRL_REG);
+       ret = twl4030_i2c_read_u8(TWL4030_CHIP_KEYPAD,
+                                 TWL4030_KEYPAD_KEYP_CTRL_REG, &ctrl);
 
        if (ret)
                return ret;
@@ -615,8 +615,8 @@ int rx51_kp_tstc(void)
        for (i = 0; i < 2; i++) {
 
                /* check interrupt register for events */
-               twl4030_i2c_read_u8(TWL4030_CHIP_KEYPAD, &intr,
-                               TWL4030_KEYPAD_KEYP_ISR1+(2*i));
+               twl4030_i2c_read_u8(TWL4030_CHIP_KEYPAD,
+                                   TWL4030_KEYPAD_KEYP_ISR1 + (2 * i), &intr);
 
                /* no event */
                if (!(intr&1))

diff --git a/drivers/power/twl4030.c b/drivers/power/twl4030.c
index 2bf94b134c64e363757045076313aa7648d1573b..6610f787d0c7795a656619b28718944b84202fd1 100644 (file)
--- 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 f41cc07fe709459e1c45a3f7b4132ae3c594cedf..74f1dccbd49531128ed14c3fefcfb3654db80d11 100644 (file)
--- 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

diff --git a/include/twl4030.h b/include/twl4030.h
index aca695d5bb5cc2790de1ab4b858c67c6ab631f50..569ad2773fb02d0a1c2874f52ea9cbda5129e8a9 100644 (file)
--- a/include/twl4030.h
+++ b/include/twl4030.h
@@ -643,7 +643,7 @@ static inline int twl4030_i2c_write_u8(u8 chip_no, u8 reg, u8 val)
        return i2c_write(chip_no, reg, 1, &val, 1);
 }
 
-static inline int twl4030_i2c_read_u8(u8 chip_no, u8 *val, u8 reg)
+static inline int twl4030_i2c_read_u8(u8 chip_no, u8 reg, u8 *val)
 {
        return i2c_read(chip_no, reg, 1, val, 1);
 }