Merge branch 'master' of git://git.denx.de/u-boot into master

[karo-tx-uboot.git] / board / woodburn / woodburn.c

diff --git a/board/woodburn/woodburn.c b/board/woodburn/woodburn.c
index 286749f3c910e2f409fd741220d7c0b5c885fcf0..66a0d35450a0be722082354ff7dac7fce2e8560d 100644 (file)
--- 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