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/hale/tt01/tt01.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/hale/tt01/tt01.c')
| -rw-r--r-- | board/hale/tt01/tt01.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/board/hale/tt01/tt01.c b/board/hale/tt01/tt01.c index 143fcef..0c2cb79 100644 --- a/board/hale/tt01/tt01.c +++ b/board/hale/tt01/tt01.c @@ -25,12 +25,13 @@ #include <common.h> #include <netdev.h> #include <command.h> -#include <pmic.h> +#include <power/pmic.h> #include <fsl_pmic.h> #include <mc13783.h> #include <asm/arch/clock.h> #include <asm/arch/sys_proto.h> #include <asm/io.h> +#include <errno.h> DECLARE_GLOBAL_DATA_PTR; @@ -195,14 +196,21 @@ int board_mmc_init(bd_t *bis) { u32 val; struct pmic *p; + int ret; /* * this is the first driver to use the pmic, so call * pmic_init() here. board_late_init() is too late for * the MMC driver. */ - pmic_init(); - p = get_pmic(); + + ret = pmic_init(I2C_PMIC); + if (ret) + return ret; + + p = pmic_get("FSL_PMIC"); + if (!p) + return -ENODEV; /* configure pins for SDHC1 only */ mx31_gpio_mux(IOMUX_MODE(MUX_CTL_SD1_CLK, MUX_CTL_FUNC)); |