diff options
| author | Tom Rini <trini@ti.com> | 2013-12-10 17:15:18 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-12-10 17:15:18 -0500 |
| commit | 4b210ad34282bfd9fc982a8e3c9a9126f4094cdb (patch) | |
| tree | f91ebdc46ede952728602d5ecc18e64ad0e52682 /arch/arm/cpu/armv7/omap4/hw_data.c | |
| parent | 65b7fe28a12bbaccc7a0c076f5f9f213150030e7 (diff) | |
| parent | f15ea6e1d67782a1626d4a4922b6c20e380085e5 (diff) | |
| download | olio-uboot-2014.01-4b210ad34282bfd9fc982a8e3c9a9126f4094cdb.tar.xz olio-uboot-2014.01-4b210ad34282bfd9fc982a8e3c9a9126f4094cdb.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
board/samsung/trats2/trats2.c
include/configs/exynos5250-dt.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/arm/cpu/armv7/omap4/hw_data.c')
| -rw-r--r-- | arch/arm/cpu/armv7/omap4/hw_data.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/cpu/armv7/omap4/hw_data.c b/arch/arm/cpu/armv7/omap4/hw_data.c index 6a225c8cb..1b2f43924 100644 --- a/arch/arm/cpu/armv7/omap4/hw_data.c +++ b/arch/arm/cpu/armv7/omap4/hw_data.c @@ -288,17 +288,21 @@ struct vcores_data omap4460_volts = { .mm.pmic = &twl6030, }; +/* + * Take closest integer part of the mV value corresponding to a TWL6032 SMPS + * voltage selection code. Aligned with OMAP4470 ES1.0 OCA V.0.7. + */ struct vcores_data omap4470_volts = { - .mpu.value = 1200, + .mpu.value = 1202, .mpu.addr = SMPS_REG_ADDR_SMPS1, .mpu.pmic = &twl6030, .core.value = 1126, - .core.addr = SMPS_REG_ADDR_SMPS1, + .core.addr = SMPS_REG_ADDR_SMPS2, .core.pmic = &twl6030, - .mm.value = 1137, - .mm.addr = SMPS_REG_ADDR_SMPS1, + .mm.value = 1139, + .mm.addr = SMPS_REG_ADDR_SMPS5, .mm.pmic = &twl6030, }; |