summaryrefslogtreecommitdiff
path: root/board/woodburn/woodburn.c
diff options
context:
space:
mode:
Diffstat (limited to 'board/woodburn/woodburn.c')
-rw-r--r--board/woodburn/woodburn.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/board/woodburn/woodburn.c b/board/woodburn/woodburn.c
index 286749f3c9..d74f360e13 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>
@@ -133,8 +133,7 @@ int woodburn_init(void)
mxc_request_iomux(MX35_PIN_SCKR, MUX_CONFIG_ALT5);
gpio_direction_output(4, 1);
mxc_request_iomux(MX35_PIN_HCKT, MUX_CONFIG_ALT5);
- gpio_direction_output(9, 0);
- gpio_set_value(9, 1);
+ gpio_direction_output(9, 1);
return 0;
}
@@ -178,12 +177,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