power: twl6030: Device-index-specific MMC power initialization
Not every device has multiple MMC slots available, so it makes sense to enable
only the required LDOs for the available slots. Generic code in omap_hsmmc will
enable both VMMC and VAUX1, in doubt.
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
diff --git a/drivers/power/twl6030.c b/drivers/power/twl6030.c
index 2fb3967..7ed9129 100644
--- a/drivers/power/twl6030.c
+++ b/drivers/power/twl6030.c
@@ -212,34 +212,36 @@
return;
}
-void twl6030_power_mmc_init()
+void twl6030_power_mmc_init(int dev_index)
{
u8 value = 0;
- /* 3.0V voltage output for VMMC */
- twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VMMC_CFG_VOLTAGE,
- TWL6030_CFG_VOLTAGE_30);
+ 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);
+ /* 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);
+ twl6030_i2c_read_u8(TWL6030_CHIP_PM, TWL6030_PH_STS_BOOT, &value);
+ } else if (dev_index == 1) {
+ /* 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);
+ }
- /* 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);
}
-
- /* 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()