summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/power/twl6030.c26
-rw-r--r--include/twl6030.h14
2 files changed, 25 insertions, 15 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
diff --git a/include/twl6030.h b/include/twl6030.h
index 7898699eac..bb02d6f95c 100644
--- a/include/twl6030.h
+++ b/include/twl6030.h
@@ -20,16 +20,22 @@
#define TWL6030_CHIP_PWM 0x49
/* Slave Address 0x48 */
-#define VMMC_CFG_STATE 0x9A
-#define VMMC_CFG_VOLTATE 0x9B
-#define VUSB_CFG_STATE 0xA2
+#define TWL6030_VMMC_CFG_STATE 0x9A
+#define TWL6030_VMMC_CFG_VOLTAGE 0x9B
+#define TWL6030_VUSB_CFG_STATE 0xA2
+
+#define TWL6030_CFG_GRP_P1 (1 << 0)
+#define TWL6030_CFG_STATE_ON (1 << 0)
+#define TWL6030_CFG_STATE_P1 (TWL6030_CFG_GRP_P1 << 5)
+#define TWL6030_CFG_VOLTAGE_30 0x15
#define MISC1 0xE4
#define VAC_MEAS (1 << 2)
#define VBAT_MEAS (1 << 1)
#define BB_MEAS (1 << 0)
-#define MISC2 0xE5
+#define TWL6030_MISC2 0xE5
+#define TWL6030_MISC2_VUSB_IN_VSYS (1 << 4)
/* Slave Address 0x49 */