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 /include/twl4030.h | |
| 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 'include/twl4030.h')
| -rw-r--r-- | include/twl4030.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/twl4030.h b/include/twl4030.h index 930c285..9cd32ab 100644 --- a/include/twl4030.h +++ b/include/twl4030.h @@ -310,6 +310,7 @@ #define TWL4030_PM_RECEIVER_VPLL2_VSEL_18 0x05 #define TWL4030_PM_RECEIVER_VDAC_VSEL_18 0x03 #define TWL4030_PM_RECEIVER_VMMC1_VSEL_30 0x02 +#define TWL4030_PM_RECEIVER_VMMC1_VSEL_32 0x03 /* Device Selection in PM Receiver Module */ #define TWL4030_PM_RECEIVER_DEV_GRP_P1 0x20 |