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/samsung/goni/goni.c | |
parent | db71964235c1dfa13ec398da483b0bdbbf31d5b7 (diff) | |
parent | 59ddead140a7cfda78bc36e22aadc48f3b962e59 (diff) | |
download | u-boot-imx-bb367b95f9204115bd6eac82e839b5590e6da4eb.zip u-boot-imx-bb367b95f9204115bd6eac82e839b5590e6da4eb.tar.gz u-boot-imx-bb367b95f9204115bd6eac82e839b5590e6da4eb.tar.bz2 |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
Diffstat (limited to 'board/samsung/goni/goni.c')
-rw-r--r-- | board/samsung/goni/goni.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c index e8fb1ea..ff76963 100644 --- a/board/samsung/goni/goni.c +++ b/board/samsung/goni/goni.c @@ -25,10 +25,10 @@ #include <common.h> #include <asm/arch/gpio.h> #include <asm/arch/mmc.h> -#include <pmic.h> +#include <power/pmic.h> #include <usb/s3c_udc.h> #include <asm/arch/cpu.h> -#include <max8998_pmic.h> +#include <power/max8998_pmic.h> DECLARE_GLOBAL_DATA_PTR; static struct s5pc110_gpio *s5pc110_gpio; @@ -41,9 +41,17 @@ int board_init(void) gd->bd->bi_arch_number = MACH_TYPE_GONI; gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100; -#if defined(CONFIG_PMIC) - pmic_init(); -#endif + return 0; +} + +int power_init_board(void) +{ + int ret; + + ret = pmic_init(I2C_5); + if (ret) + return ret; + return 0; } @@ -108,7 +116,9 @@ static int s5pc1xx_phy_control(int on) { int ret; static int status; - struct pmic *p = get_pmic(); + struct pmic *p = pmic_get("MAX8998_PMIC"); + if (!p) + return -ENODEV; if (pmic_probe(p)) return -1; |