diff options
author | Stefano Babic <sbabic@denx.de> | 2012-12-08 11:02:45 (GMT) |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2012-12-08 11:02:45 (GMT) |
commit | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 (patch) | |
tree | 764536da9202b9de387a0d957829f64dfba818b7 /board/woodburn | |
parent | 393ff47ba3123208f7c4f08d63f114300a41d0c4 (diff) | |
parent | fd4d564b3c80b111f18c93adb14233a6a7ddb0e9 (diff) | |
download | u-boot-05a860c228fe6c8f2e7aced8cc8ef88bc1038363.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot into master
Conflicts:
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/woodburn_common.h
board/woodburn/woodburn.c
These boards still use the old old PMIC framework, so they
do not merge properly after the power framework was merged into
mainline.
Fix all conflicts and update woodburn to use Power Framework.
Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'board/woodburn')
-rw-r--r-- | board/woodburn/woodburn.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/board/woodburn/woodburn.c b/board/woodburn/woodburn.c index 286749f..66a0d35 100644 --- a/board/woodburn/woodburn.c +++ b/board/woodburn/woodburn.c @@ -31,7 +31,7 @@ #include <asm/arch/mx35_pins.h> #include <asm/arch/iomux.h> #include <i2c.h> -#include <pmic.h> +#include <power/pmic.h> #include <fsl_pmic.h> #include <mc13892.h> #include <mmc.h> @@ -178,12 +178,16 @@ int board_init(void) { struct pmic *p; u32 val; + int ret; /* address of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100; - pmic_init(); - p = get_pmic(); + ret = pmic_init(I2C_PMIC); + if (ret) + return ret; + + p = pmic_get("FSL_PMIC"); /* * Set switchers in Auto in NORMAL mode & STANDBY mode |