LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

twl4030: make twl4030_i2c_write_u8 prototype consistent 

u-boot standard i2c register write prototype is
i2c_reg_write(u8 addr, u8 reg, u8 val)

twl4030_i2c_write_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_write_u8(u8 addr, u8 reg, u8 val)

Signed-off-by: Nishanth Menon <nm@ti.com>
This commit is contained in:
Nishanth Menon 2013-03-26 05:20:49 +00:00 committed by Tom Rini
parent cd87464d08
commit 0208aaf6c2
7 changed files with 62 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
board/cm_t35/cm_t35.c
View File

@ -493,17 +493,17 @@ static void setup_net_chip_gmpc(void)
static void reset_net_chip(void) static void reset_net_chip(void)
{ {
/* Set GPIO1 of TPS65930 as output */ /* Set GPIO1 of TPS65930 as output */
twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, 0x02, twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, TWL4030_BASEADD_GPIO + 0x03,
TWL4030_BASEADD_GPIO + 0x03); 0x02);
/* Send a pulse on the GPIO pin */ /* Send a pulse on the GPIO pin */
twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, 0x02, twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, TWL4030_BASEADD_GPIO + 0x0C,
TWL4030_BASEADD_GPIO + 0x0C); 0x02);
udelay(1); udelay(1);
twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, 0x02, twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, TWL4030_BASEADD_GPIO + 0x09,
TWL4030_BASEADD_GPIO + 0x09); 0x02);
mdelay(40); mdelay(40);
twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, 0x02, twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, TWL4030_BASEADD_GPIO + 0x0C,
TWL4030_BASEADD_GPIO + 0x0C); 0x02);
mdelay(1); mdelay(1);
} }
#else #else
@ -600,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); twl4030_i2c_read_u8(TWL4030_CHIP_GPIO, &val, offset);
/* Set GPIO6 and GPIO7 of TPS65930 as output */ /* Set GPIO6 and GPIO7 of TPS65930 as output */
val |= 0xC0; 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; offset = TWL4030_BASEADD_GPIO + TWL4030_GPIO_SETGPIODATAOUT1;
/* Take both PHYs out of reset */ /* 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); udelay(1);
return omap_ehci_hcd_init(&usbhs_bdata, hccr, hcor); return omap_ehci_hcd_init(&usbhs_bdata, hccr, hcor);

36
board/nokia/rx51/rx51.c
View File

@ -332,10 +332,10 @@ void *video_hw_init(void)
static void twl4030_regulator_set_mode(u8 id, u8 mode) static void twl4030_regulator_set_mode(u8 id, u8 mode)
{ {
u16 msg = MSG_SINGULAR(DEV_GRP_P1, id, mode); u16 msg = MSG_SINGULAR(DEV_GRP_P1, id, mode);
twl4030_i2c_write_u8(TWL4030_CHIP_PM_MASTER, msg >> 8, twl4030_i2c_write_u8(TWL4030_CHIP_PM_MASTER,
TWL4030_PM_MASTER_PB_WORD_MSB); TWL4030_PM_MASTER_PB_WORD_MSB, msg >> 8);
twl4030_i2c_write_u8(TWL4030_CHIP_PM_MASTER, msg & 0xff, twl4030_i2c_write_u8(TWL4030_CHIP_PM_MASTER,
TWL4030_PM_MASTER_PB_WORD_LSB); TWL4030_PM_MASTER_PB_WORD_LSB, msg & 0xff);
} }
static void omap3_emu_romcode_call(u32 service_id, u32 *parameters) static void omap3_emu_romcode_call(u32 service_id, u32 *parameters)
@ -410,8 +410,8 @@ int misc_init_r(void)
TWL4030_PM_MASTER_PB_CFG); TWL4030_PM_MASTER_PB_CFG);
/* enable I2C access to powerbus (needed for twl4030 regulator) */ /* enable I2C access to powerbus (needed for twl4030 regulator) */
twl4030_i2c_write_u8(TWL4030_CHIP_PM_MASTER, 0x02, twl4030_i2c_write_u8(TWL4030_CHIP_PM_MASTER, TWL4030_PM_MASTER_PB_CFG,
TWL4030_PM_MASTER_PB_CFG); 0x02);
/* set VAUX3, VSIM and VMMC1 state to active - enable eMMC memory */ /* set VAUX3, VSIM and VMMC1 state to active - enable eMMC memory */
twl4030_regulator_set_mode(RES_VAUX3, RES_STATE_ACTIVE); twl4030_regulator_set_mode(RES_VAUX3, RES_STATE_ACTIVE);
@ -419,8 +419,8 @@ int misc_init_r(void)
twl4030_regulator_set_mode(RES_VMMC1, RES_STATE_ACTIVE); twl4030_regulator_set_mode(RES_VMMC1, RES_STATE_ACTIVE);
/* restore I2C access state */ /* restore I2C access state */
twl4030_i2c_write_u8(TWL4030_CHIP_PM_MASTER, state, twl4030_i2c_write_u8(TWL4030_CHIP_PM_MASTER, TWL4030_PM_MASTER_PB_CFG,
TWL4030_PM_MASTER_PB_CFG); state);
/* set env variable attkernaddr for relocated kernel */ /* set env variable attkernaddr for relocated kernel */
sprintf(buf, "%#x", KERNEL_ADDRESS); sprintf(buf, "%#x", KERNEL_ADDRESS);
@ -481,8 +481,8 @@ void hw_watchdog_reset(void)
/* timeout 0 means watchdog is disabled */ /* timeout 0 means watchdog is disabled */
/* reset watchdog timeout to 31s (maximum) */ /* reset watchdog timeout to 31s (maximum) */
if (timeout != 0) if (timeout != 0)
twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, 31, twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER,
TWL4030_PM_RECEIVER_WATCHDOG_CFG); TWL4030_PM_RECEIVER_WATCHDOG_CFG, 31);
/* store last watchdog reset time */ /* store last watchdog reset time */
twl_wd_time = get_timer(0); twl_wd_time = get_timer(0);
@ -541,18 +541,18 @@ int rx51_kp_init(void)
ctrl |= TWL4030_KEYPAD_CTRL_KBD_ON; ctrl |= TWL4030_KEYPAD_CTRL_KBD_ON;
ctrl |= TWL4030_KEYPAD_CTRL_SOFT_NRST; ctrl |= TWL4030_KEYPAD_CTRL_SOFT_NRST;
ctrl |= TWL4030_KEYPAD_CTRL_SOFTMODEN; ctrl |= TWL4030_KEYPAD_CTRL_SOFTMODEN;
ret |= twl4030_i2c_write_u8(TWL4030_CHIP_KEYPAD, ctrl, ret |= twl4030_i2c_write_u8(TWL4030_CHIP_KEYPAD,
TWL4030_KEYPAD_KEYP_CTRL_REG); TWL4030_KEYPAD_KEYP_CTRL_REG, ctrl);
/* enable key event status */ /* enable key event status */
ret |= twl4030_i2c_write_u8(TWL4030_CHIP_KEYPAD, 0xfe, ret |= twl4030_i2c_write_u8(TWL4030_CHIP_KEYPAD,
TWL4030_KEYPAD_KEYP_IMR1); TWL4030_KEYPAD_KEYP_IMR1, 0xfe);
/* enable interrupt generation on rising and falling */ /* enable interrupt generation on rising and falling */
/* this is a workaround for qemu twl4030 emulation */ /* this is a workaround for qemu twl4030 emulation */
ret |= twl4030_i2c_write_u8(TWL4030_CHIP_KEYPAD, 0x57, ret |= twl4030_i2c_write_u8(TWL4030_CHIP_KEYPAD,
TWL4030_KEYPAD_KEYP_EDR); TWL4030_KEYPAD_KEYP_EDR, 0x57);
/* enable ISR clear on read */ /* enable ISR clear on read */
ret |= twl4030_i2c_write_u8(TWL4030_CHIP_KEYPAD, 0x05, ret |= twl4030_i2c_write_u8(TWL4030_CHIP_KEYPAD,
TWL4030_KEYPAD_KEYP_SIH_CTRL); TWL4030_KEYPAD_KEYP_SIH_CTRL, 0x05);
return 0; return 0;
} }

3
board/pandora/pandora.c
View File

@ -114,8 +114,9 @@ int misc_init_r(void)
/* Enable battery backup capacitor (3.2V, 0.5mA charge current) */ /* Enable battery backup capacitor (3.2V, 0.5mA charge current) */
twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER,
TWL4030_PM_RECEIVER_BB_CFG,
TWL4030_BB_CFG_BBCHEN | TWL4030_BB_CFG_BBSEL_3200MV | TWL4030_BB_CFG_BBCHEN | TWL4030_BB_CFG_BBSEL_3200MV |
TWL4030_BB_CFG_BBISEL_500UA, TWL4030_PM_RECEIVER_BB_CFG); TWL4030_BB_CFG_BBISEL_500UA);
dieid_num_r(); dieid_num_r();

4
drivers/misc/twl4030_led.c
View File

@ -42,7 +42,7 @@ void twl4030_led_init(unsigned char ledon_mask)
if (ledon_mask & TWL4030_LED_LEDEN_LEDBON) if (ledon_mask & TWL4030_LED_LEDEN_LEDBON)
ledon_mask |= TWL4030_LED_LEDEN_LEDBPWM; ledon_mask |= TWL4030_LED_LEDEN_LEDBPWM;
twl4030_i2c_write_u8(TWL4030_CHIP_LED, ledon_mask, twl4030_i2c_write_u8(TWL4030_CHIP_LED, TWL4030_LED_LEDEN,
TWL4030_LED_LEDEN); ledon_mask);
} }

12
drivers/power/twl4030.c
View File

@ -51,8 +51,8 @@ void twl4030_power_reset_init(void)
printf("Could not initialize hardware reset\n"); printf("Could not initialize hardware reset\n");
} else { } else {
val |= TWL4030_PM_MASTER_SW_EVENTS_STOPON_PWRON; val |= TWL4030_PM_MASTER_SW_EVENTS_STOPON_PWRON;
if (twl4030_i2c_write_u8(TWL4030_CHIP_PM_MASTER, val, if (twl4030_i2c_write_u8(TWL4030_CHIP_PM_MASTER,
TWL4030_PM_MASTER_P1_SW_EVENTS)) { TWL4030_PM_MASTER_P1_SW_EVENTS, val)) {
printf("Error:TWL4030: failed to write the power register\n"); printf("Error:TWL4030: failed to write the power register\n");
printf("Could not initialize hardware reset\n"); printf("Could not initialize hardware reset\n");
} }
@ -68,8 +68,8 @@ void twl4030_pmrecv_vsel_cfg(u8 vsel_reg, u8 vsel_val,
int ret; int ret;
/* Select the Voltage */ /* Select the Voltage */
ret = twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, vsel_val, ret = twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, vsel_reg,
vsel_reg); vsel_val);
if (ret != 0) { if (ret != 0) {
printf("Could not write vsel to reg %02x (%d)\n", printf("Could not write vsel to reg %02x (%d)\n",
vsel_reg, ret); vsel_reg, ret);
@ -77,8 +77,8 @@ void twl4030_pmrecv_vsel_cfg(u8 vsel_reg, u8 vsel_val,
} }
/* Select the Device Group (enable the supply if dev_grp_sel != 0) */ /* Select the Device Group (enable the supply if dev_grp_sel != 0) */
ret = twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, dev_grp_sel, ret = twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, dev_grp,
dev_grp); dev_grp_sel);
if (ret != 0) if (ret != 0)
printf("Could not write grp_sel to reg %02x (%d)\n", printf("Could not write grp_sel to reg %02x (%d)\n",
dev_grp, ret); dev_grp, ret);

46
drivers/usb/phy/twl4030.c
View File

@ -54,7 +54,7 @@ static int twl4030_usb_write(u8 address, u8 data)
{ {
int ret; int ret;
ret = twl4030_i2c_write_u8(TWL4030_CHIP_USB, data, address); ret = twl4030_i2c_write_u8(TWL4030_CHIP_USB, address, data);
if (ret != 0) if (ret != 0)
printf("TWL4030:USB:Write[0x%x] Error %d\n", address, ret); printf("TWL4030:USB:Write[0x%x] Error %d\n", address, ret);
@ -78,40 +78,40 @@ static int twl4030_usb_read(u8 address)
static void twl4030_usb_ldo_init(void) static void twl4030_usb_ldo_init(void)
{ {
/* Enable writing to power configuration registers */ /* Enable writing to power configuration registers */
twl4030_i2c_write_u8(TWL4030_CHIP_PM_MASTER, 0xC0, twl4030_i2c_write_u8(TWL4030_CHIP_PM_MASTER,
TWL4030_PM_MASTER_PROTECT_KEY); TWL4030_PM_MASTER_PROTECT_KEY, 0xC0);
twl4030_i2c_write_u8(TWL4030_CHIP_PM_MASTER, 0x0C, twl4030_i2c_write_u8(TWL4030_CHIP_PM_MASTER,
TWL4030_PM_MASTER_PROTECT_KEY); TWL4030_PM_MASTER_PROTECT_KEY, 0x0C);
/* put VUSB3V1 LDO in active state */ /* put VUSB3V1 LDO in active state */
twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, 0x00, twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER,
TWL4030_PM_RECEIVER_VUSB_DEDICATED2); TWL4030_PM_RECEIVER_VUSB_DEDICATED2, 0x00);
/* input to VUSB3V1 LDO is from VBAT, not VBUS */ /* input to VUSB3V1 LDO is from VBAT, not VBUS */
twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, 0x14, twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER,
TWL4030_PM_RECEIVER_VUSB_DEDICATED1); TWL4030_PM_RECEIVER_VUSB_DEDICATED1, 0x14);
/* turn on 3.1V regulator */ /* turn on 3.1V regulator */
twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, 0x20, twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER,
TWL4030_PM_RECEIVER_VUSB3V1_DEV_GRP); TWL4030_PM_RECEIVER_VUSB3V1_DEV_GRP, 0x20);
twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, 0x00, twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER,
TWL4030_PM_RECEIVER_VUSB3V1_TYPE); TWL4030_PM_RECEIVER_VUSB3V1_TYPE, 0x00);
/* turn on 1.5V regulator */ /* turn on 1.5V regulator */
twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, 0x20, twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER,
TWL4030_PM_RECEIVER_VUSB1V5_DEV_GRP); TWL4030_PM_RECEIVER_VUSB1V5_DEV_GRP, 0x20);
twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, 0x00, twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER,
TWL4030_PM_RECEIVER_VUSB1V5_TYPE); TWL4030_PM_RECEIVER_VUSB1V5_TYPE, 0x00);
/* turn on 1.8V regulator */ /* turn on 1.8V regulator */
twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, 0x20, twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER,
TWL4030_PM_RECEIVER_VUSB1V8_DEV_GRP); TWL4030_PM_RECEIVER_VUSB1V8_DEV_GRP, 0x20);
twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, 0x00, twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER,
TWL4030_PM_RECEIVER_VUSB1V8_TYPE); TWL4030_PM_RECEIVER_VUSB1V8_TYPE, 0x00);
/* disable access to power configuration registers */ /* disable access to power configuration registers */
twl4030_i2c_write_u8(TWL4030_CHIP_PM_MASTER, 0x00, twl4030_i2c_write_u8(TWL4030_CHIP_PM_MASTER,
TWL4030_PM_MASTER_PROTECT_KEY); TWL4030_PM_MASTER_PROTECT_KEY, 0x00);
} }
static void twl4030_phy_power(void) static void twl4030_phy_power(void)

2
include/twl4030.h
View File

@ -638,7 +638,7 @@
* examples are TWL4030_PM_RECEIVER_VMMC1_DEV_GRP and * examples are TWL4030_PM_RECEIVER_VMMC1_DEV_GRP and
* TWL4030_LED_LEDEN. * TWL4030_LED_LEDEN.
*/ */
static inline int twl4030_i2c_write_u8(u8 chip_no, u8 val, u8 reg) static inline int twl4030_i2c_write_u8(u8 chip_no, u8 reg, u8 val)
{ {
return i2c_write(chip_no, reg, 1, &val, 1); return i2c_write(chip_no, reg, 1, &val, 1);
} }