X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=drivers%2Fpower%2Ftwl6030.c;h=cd532008bdd001184a93eb83b22b0e343b59c227;hb=dc19b06ff23fb8f97e445f1c94dd5ae43046ea61;hp=8924f7f0e911515f5095f0f2e31aa2fe5d17c019;hpb=c5dbae7c19856171e0580f490dfb3d667466e8f3;p=u-boot

diff --git a/drivers/power/twl6030.c b/drivers/power/twl6030.c
index 8924f7f0e9..cd532008bd 100644
--- 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);
@@ -212,21 +219,46 @@ void twl6030_init_battery_charging(void)
 	return;
 }
 
-void twl6030_power_mmc_init()
+void twl6030_power_mmc_init(int dev_index)
 {
-	/* 3.0V voltage output for VMMC */
-	twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VMMC_CFG_VOLTAGE,
-		TWL6030_CFG_VOLTAGE_30);
+	u8 value = 0;
 
-	/* Enable P1 output for VMMC */
-	twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VMMC_CFG_STATE,
-		TWL6030_CFG_STATE_P1 | TWL6030_CFG_STATE_ON);
+	if (dev_index == 0) {
+		/* 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);
+	} 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 */
+			twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VAUX1_CFG_VOLTAGE,
+				TWL6030_CFG_VOLTAGE_18);
+		} else {
+			/* 2.8V voltage output for VAUX1 */
+			twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VAUX1_CFG_VOLTAGE,
+				TWL6030_CFG_VOLTAGE_28);
+		}
+
+		/* Enable P1 output for VAUX */
+		twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VAUX1_CFG_STATE,
+			TWL6030_CFG_STATE_P1 | TWL6030_CFG_STATE_ON);
+	}
 }
 
 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);
@@ -234,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