LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Paul Kocialkowski 2016-02-27 19:18:51 +01:00 committed by Tom Rini
parent d7b6a75497
commit a85362fb3e
3 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mmc/omap_hsmmc.c
View File

@ -104,8 +104,8 @@ static void omap4_vmmc_pbias_config(struct mmc *mmc)
value = readl((*ctrl)->control_pbiaslite); value = readl((*ctrl)->control_pbiaslite);
value &= ~(MMC1_PBIASLITE_PWRDNZ | MMC1_PWRDNZ); value &= ~(MMC1_PBIASLITE_PWRDNZ | MMC1_PWRDNZ);
writel(value, (*ctrl)->control_pbiaslite); writel(value, (*ctrl)->control_pbiaslite);
/* set VMMC to 3V */ twl6030_power_mmc_init(0);
twl6030_power_mmc_init(); twl6030_power_mmc_init(1);
value = readl((*ctrl)->control_pbiaslite); value = readl((*ctrl)->control_pbiaslite);
value |= MMC1_PBIASLITE_VMODE | MMC1_PBIASLITE_PWRDNZ | MMC1_PWRDNZ; value |= MMC1_PBIASLITE_VMODE | MMC1_PBIASLITE_PWRDNZ | MMC1_PWRDNZ;
writel(value, (*ctrl)->control_pbiaslite); writel(value, (*ctrl)->control_pbiaslite);

44
drivers/power/twl6030.c
View File

@ -212,34 +212,36 @@ void twl6030_init_battery_charging(void)
return; return;
} }
void twl6030_power_mmc_init() void twl6030_power_mmc_init(int dev_index)
{ {
u8 value = 0; u8 value = 0;
/* 3.0V voltage output for VMMC */ if (dev_index == 0) {
twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VMMC_CFG_VOLTAGE, /* 3.0V voltage output for VMMC */
TWL6030_CFG_VOLTAGE_30); twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VMMC_CFG_VOLTAGE,
TWL6030_CFG_VOLTAGE_30);
/* Enable P1 output for VMMC */ /* Enable P1 output for VMMC */
twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VMMC_CFG_STATE, twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VMMC_CFG_STATE,
TWL6030_CFG_STATE_P1 | TWL6030_CFG_STATE_ON); 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 */ /* Enable P1 output for VAUX */
if (value & TWL6030_PH_STS_BOOT2) { twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VAUX1_CFG_STATE,
/* 1.8V voltage output for VAUX1 */ TWL6030_CFG_STATE_P1 | TWL6030_CFG_STATE_ON);
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() void twl6030_usb_device_settings()

2
include/twl6030.h
View File

@ -185,6 +185,6 @@ void twl6030_start_usb_charging(void);
void twl6030_stop_usb_charging(void); void twl6030_stop_usb_charging(void);
int twl6030_get_battery_voltage(void); int twl6030_get_battery_voltage(void);
int twl6030_get_battery_current(void); int twl6030_get_battery_current(void);
void twl6030_power_mmc_init(void); void twl6030_power_mmc_init(int dev_index);
#endif /* TWL6030_H */ #endif /* TWL6030_H */