summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorPaul Kocialkowski <contact@paulk.fr>2016-02-27 19:18:49 +0100
committerTom Rini <trini@konsulko.com>2016-03-15 15:10:50 -0400
commitc5dbae7c19856171e0580f490dfb3d667466e8f3 (patch)
tree0696d3b0c36d12efeb72a882df42167cdff1a279 /drivers/power
parent6add08e97a012b47e904ec0f3d3363739fbe2555 (diff)
downloadblackbird-obmc-uboot-c5dbae7c19856171e0580f490dfb3d667466e8f3.tar.gz
blackbird-obmc-uboot-c5dbae7c19856171e0580f490dfb3d667466e8f3.zip
power: twl6030: Some more explicit registers and values definitions
This makes the twl6030 mmc and usb-related power registers and values definitions more explicit and clear and adds prefixes to them. Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/twl6030.c26
1 files changed, 15 insertions, 11 deletions
diff --git a/drivers/power/twl6030.c b/drivers/power/twl6030.c
index a1c6663a2e..8924f7f0e9 100644
--- a/drivers/power/twl6030.c
+++ b/drivers/power/twl6030.c
@@ -214,22 +214,26 @@ void twl6030_init_battery_charging(void)
void twl6030_power_mmc_init()
{
- /* set voltage to 3.0 and turnon for APP */
- twl6030_i2c_write_u8(TWL6030_CHIP_PM, VMMC_CFG_VOLTATE, 0x15);
- twl6030_i2c_write_u8(TWL6030_CHIP_PM, VMMC_CFG_STATE, 0x21);
+ /* 3.0V voltage output for VMMC */
+ twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VMMC_CFG_VOLTAGE,
+ TWL6030_CFG_VOLTAGE_30);
+
+ /* Enable P1 output for VMMC */
+ twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VMMC_CFG_STATE,
+ TWL6030_CFG_STATE_P1 | TWL6030_CFG_STATE_ON);
}
void twl6030_usb_device_settings()
{
- u8 data = 0;
-
- /* Select APP Group and set state to ON */
- twl6030_i2c_write_u8(TWL6030_CHIP_PM, VUSB_CFG_STATE, 0x21);
+ u8 value = 0;
- twl6030_i2c_read_u8(TWL6030_CHIP_PM, MISC2, &data);
- data |= 0x10;
+ /* Enable P1 output for VUSB */
+ twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VUSB_CFG_STATE,
+ TWL6030_CFG_STATE_P1 | TWL6030_CFG_STATE_ON);
- /* Select the input supply for VBUS regulator */
- twl6030_i2c_write_u8(TWL6030_CHIP_PM, MISC2, data);
+ /* Select the input supply for VUSB regulator */
+ twl6030_i2c_read_u8(TWL6030_CHIP_PM, TWL6030_MISC2, &value);
+ value |= TWL6030_MISC2_VUSB_IN_VSYS;
+ twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_MISC2, value);
}
#endif
OpenPOWER on IntegriCloud