diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-12-10 22:45:34 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-12-10 22:45:34 +0100 |
| commit | 84d018268a8af1d9f271b398748652c5112e951a (patch) | |
| tree | 65572a9581dd795061b424a01ca118870fc52a66 /drivers | |
| parent | a612ae37595b2b4af71c992d38a3bc17c1c866e2 (diff) | |
| parent | 71bdf829a0952b76710f945375a72181d61fd4c2 (diff) | |
| download | u-boot-imx-84d018268a8af1d9f271b398748652c5112e951a.zip u-boot-imx-84d018268a8af1d9f271b398748652c5112e951a.tar.gz u-boot-imx-84d018268a8af1d9f271b398748652c5112e951a.tar.bz2 | |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
Update pci_ids.h from current Linux sources
omap: overo: Use ubifs instead of jffs2 for nand
omap: TWL4030 Bump VMMC1 interface voltage from 3V to 3.15V
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/power/twl4030.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/twl4030.c b/drivers/power/twl4030.c index 5a7323a..4a4ddeb 100644 --- a/drivers/power/twl4030.c +++ b/drivers/power/twl4030.c @@ -97,9 +97,9 @@ void twl4030_power_init(void) void twl4030_power_mmc_init(void) { - /* Set VMMC1 to 3 Volts */ + /* Set VMMC1 to 3.15 Volts */ twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VMMC1_DEDICATED, - TWL4030_PM_RECEIVER_VMMC1_VSEL_30, + TWL4030_PM_RECEIVER_VMMC1_VSEL_32, TWL4030_PM_RECEIVER_VMMC1_DEV_GRP, TWL4030_PM_RECEIVER_DEV_GRP_P1); } |