mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-19 05:31:32 +00:00
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
This commit is contained in:
commit
84d018268a
4 changed files with 1470 additions and 685 deletions
|
@ -97,9 +97,9 @@ void twl4030_power_init(void)
|
||||||
|
|
||||||
void twl4030_power_mmc_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_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_VMMC1_DEV_GRP,
|
||||||
TWL4030_PM_RECEIVER_DEV_GRP_P1);
|
TWL4030_PM_RECEIVER_DEV_GRP_P1);
|
||||||
}
|
}
|
||||||
|
|
|
@ -163,8 +163,8 @@
|
||||||
"mmcdev=0\0" \
|
"mmcdev=0\0" \
|
||||||
"mmcroot=/dev/mmcblk0p2 rw\0" \
|
"mmcroot=/dev/mmcblk0p2 rw\0" \
|
||||||
"mmcrootfstype=ext3 rootwait\0" \
|
"mmcrootfstype=ext3 rootwait\0" \
|
||||||
"nandroot=/dev/mtdblock4 rw\0" \
|
"nandroot=ubi0:rootfs ubi.mtd=4\0" \
|
||||||
"nandrootfstype=jffs2\0" \
|
"nandrootfstype=ubifs\0" \
|
||||||
"mmcargs=setenv bootargs console=${console} " \
|
"mmcargs=setenv bootargs console=${console} " \
|
||||||
"${optargs} " \
|
"${optargs} " \
|
||||||
"mpurate=${mpurate} " \
|
"mpurate=${mpurate} " \
|
||||||
|
|
2146
include/pci_ids.h
2146
include/pci_ids.h
File diff suppressed because it is too large
Load diff
|
@ -310,6 +310,7 @@
|
||||||
#define TWL4030_PM_RECEIVER_VPLL2_VSEL_18 0x05
|
#define TWL4030_PM_RECEIVER_VPLL2_VSEL_18 0x05
|
||||||
#define TWL4030_PM_RECEIVER_VDAC_VSEL_18 0x03
|
#define TWL4030_PM_RECEIVER_VDAC_VSEL_18 0x03
|
||||||
#define TWL4030_PM_RECEIVER_VMMC1_VSEL_30 0x02
|
#define TWL4030_PM_RECEIVER_VMMC1_VSEL_30 0x02
|
||||||
|
#define TWL4030_PM_RECEIVER_VMMC1_VSEL_32 0x03
|
||||||
|
|
||||||
/* Device Selection in PM Receiver Module */
|
/* Device Selection in PM Receiver Module */
|
||||||
#define TWL4030_PM_RECEIVER_DEV_GRP_P1 0x20
|
#define TWL4030_PM_RECEIVER_DEV_GRP_P1 0x20
|
||||||
|
|
Loading…
Add table
Reference in a new issue