Merge git://git.denx.de/u-boot-spi

[u-boot] / drivers / power / twl6030.c

diff --git a/drivers/power/twl6030.c b/drivers/power/twl6030.c
index 7ed9129ac730d17b7aa07339226ce66fd0da507f..cd532008bdd001184a93eb83b22b0e343b59c227 100644 (file)
--- a/drivers/power/twl6030.c
+++ b/drivers/power/twl6030.c
@@ -5,7 +5,6 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <config.h>
-#ifdef CONFIG_TWL6030_POWER
 
 #include <twl6030.h>
 
@@ -29,6 +28,7 @@ static struct twl6030_data twl6032_info = {
        .vbat_shift     = TWL6032_VBAT_SHIFT,
 };
 
+
 static int twl6030_gpadc_read_channel(u8 channel_no)
 {
        u8 lsb = 0;
@@ -72,6 +72,13 @@ static int twl6030_gpadc_sw2_trigger(void)
        return 0;
 }
 
+void twl6030_power_off(void)
+{
+       twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_PHOENIX_DEV_ON,
+               TWL6030_PHOENIX_APP_DEVOFF | TWL6030_PHOENIX_CON_DEVOFF |
+               TWL6030_PHOENIX_MOD_DEVOFF);
+}
+
 void twl6030_stop_usb_charging(void)
 {
        twl6030_i2c_write_u8(TWL6030_CHIP_CHARGER, CONTROLLER_CTRL1, 0);
@@ -224,9 +231,9 @@ void twl6030_power_mmc_init(int dev_index)
                /* Enable P1 output for VMMC */
                twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VMMC_CFG_STATE,
                        TWL6030_CFG_STATE_P1 | TWL6030_CFG_STATE_ON);
-
-               twl6030_i2c_read_u8(TWL6030_CHIP_PM, TWL6030_PH_STS_BOOT, &value);
        } else if (dev_index == 1) {
+               twl6030_i2c_read_u8(TWL6030_CHIP_PM, TWL6030_PH_STS_BOOT,
+                                   &value);
                /* BOOT2 indicates 1.8V/2.8V VAUX1 for eMMC */
                if (value & TWL6030_PH_STS_BOOT2) {
                        /* 1.8V voltage output for VAUX1 */
@@ -248,6 +255,10 @@ void twl6030_usb_device_settings()
 {
        u8 value = 0;
 
+       /* 3.3V voltage output for VUSB */
+       twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VUSB_CFG_VOLTAGE,
+               TWL6030_CFG_VOLTAGE_33);
+
        /* Enable P1 output for VUSB */
        twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VUSB_CFG_STATE,
                TWL6030_CFG_STATE_P1 | TWL6030_CFG_STATE_ON);
@@ -255,6 +266,6 @@ void twl6030_usb_device_settings()
        /* Select the input supply for VUSB regulator */
        twl6030_i2c_read_u8(TWL6030_CHIP_PM, TWL6030_MISC2, &value);
        value |= TWL6030_MISC2_VUSB_IN_VSYS;
+       value &= ~TWL6030_MISC2_VUSB_IN_PMID;
        twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_MISC2, value);
 }
-#endif