diff options
| author | Tom Rini <trini@ti.com> | 2012-11-19 09:27:18 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-11-19 09:27:18 -0700 |
| commit | bb367b95f9204115bd6eac82e839b5590e6da4eb (patch) | |
| tree | a64a8fb6c7a86d79e9a4a0c32d48c033236815fb /board/ttcontrol/vision2/vision2.c | |
| parent | db71964235c1dfa13ec398da483b0bdbbf31d5b7 (diff) | |
| parent | 59ddead140a7cfda78bc36e22aadc48f3b962e59 (diff) | |
| download | olio-uboot-2014.01-bb367b95f9204115bd6eac82e839b5590e6da4eb.tar.xz olio-uboot-2014.01-bb367b95f9204115bd6eac82e839b5590e6da4eb.zip | |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
Diffstat (limited to 'board/ttcontrol/vision2/vision2.c')
| -rw-r--r-- | board/ttcontrol/vision2/vision2.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/board/ttcontrol/vision2/vision2.c b/board/ttcontrol/vision2/vision2.c index abdd1aac2..a471fec23 100644 --- a/board/ttcontrol/vision2/vision2.c +++ b/board/ttcontrol/vision2/vision2.c @@ -34,7 +34,7 @@ #include <asm/arch/sys_proto.h> #include <i2c.h> #include <mmc.h> -#include <pmic.h> +#include <power/pmic.h> #include <fsl_esdhc.h> #include <fsl_pmic.h> #include <mc13892.h> @@ -306,9 +306,15 @@ static void power_init_mx51(void) { unsigned int val; struct pmic *p; + int ret; + + ret = pmic_init(I2C_PMIC); + if (ret) + return; - pmic_init(); - p = get_pmic(); + p = pmic_get("FSL_PMIC"); + if (!p) + return; /* Write needed to Power Gate 2 register */ pmic_reg_read(p, REG_POWER_MISC, &val); |