twl4030: make twl4030_i2c_write_u8 prototype consistent

[karo-tx-uboot.git] / board / cm_t35 / cm_t35.c

diff --git a/board/cm_t35/cm_t35.c b/board/cm_t35/cm_t35.c
index 629ce4a5054e4ab4f6f65c6f88e3c24b9895247d..87d73546a2fd96f414c7fdc5ae918723c622ae82 100644 (file)
--- a/board/cm_t35/cm_t35.c
+++ b/board/cm_t35/cm_t35.c
@@ -91,6 +91,7 @@ static int splash_load_from_nand(u32 bmp_load_addr)
 
        res = nand_read_skip_bad(&nand_info[nand_curr_device],
                        splash_screen_nand_offset, &bmp_header_size,
+                       NULL, nand_info[nand_curr_device].size,
                        (u_char *)bmp_load_addr);
        if (res < 0)
                return res;
@@ -103,6 +104,7 @@ static int splash_load_from_nand(u32 bmp_load_addr)
 
        return nand_read_skip_bad(&nand_info[nand_curr_device],
                        splash_screen_nand_offset, &bmp_size,
+                       NULL, nand_info[nand_curr_device].size,
                        (u_char *)bmp_load_addr);
 
 splash_address_too_high:
@@ -491,17 +493,17 @@ static void setup_net_chip_gmpc(void)
 static void reset_net_chip(void)
 {
        /* Set GPIO1 of TPS65930 as output */
-       twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, 0x02,
-                               TWL4030_BASEADD_GPIO + 0x03);
+       twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, TWL4030_BASEADD_GPIO + 0x03,
+                            0x02);
        /* Send a pulse on the GPIO pin */
-       twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, 0x02,
-                               TWL4030_BASEADD_GPIO + 0x0C);
+       twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, TWL4030_BASEADD_GPIO + 0x0C,
+                            0x02);
        udelay(1);
-       twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, 0x02,
-                               TWL4030_BASEADD_GPIO + 0x09);
+       twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, TWL4030_BASEADD_GPIO + 0x09,
+                            0x02);
        mdelay(40);
-       twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, 0x02,
-                               TWL4030_BASEADD_GPIO + 0x0C);
+       twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, TWL4030_BASEADD_GPIO + 0x0C,
+                            0x02);
        mdelay(1);
 }
 #else
@@ -598,10 +600,10 @@ int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
        twl4030_i2c_read_u8(TWL4030_CHIP_GPIO, &val, offset);
        /* Set GPIO6 and GPIO7 of TPS65930 as output */
        val |= 0xC0;
-       twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, val, offset);
+       twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, offset, val);
        offset = TWL4030_BASEADD_GPIO + TWL4030_GPIO_SETGPIODATAOUT1;
        /* Take both PHYs out of reset */
-       twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, 0xC0, offset);
+       twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, offset, 0xC0);
        udelay(1);
 
        return omap_ehci_hcd_init(&usbhs_bdata, hccr, hcor);