Make the necessary adaptions for the new PMIC framework, so that mx25pdk can be built again.
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com --- Stefano,
Build tested only, as I did not manage to get access to a mx25pdk.
board/freescale/mx25pdk/mx25pdk.c | 13 ++++++++++--- include/configs/mx25pdk.h | 6 +++--- 2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/board/freescale/mx25pdk/mx25pdk.c b/board/freescale/mx25pdk/mx25pdk.c index 72fa6bc..d73e27e 100644 --- a/board/freescale/mx25pdk/mx25pdk.c +++ b/board/freescale/mx25pdk/mx25pdk.c @@ -27,7 +27,7 @@ #include <mmc.h> #include <fsl_esdhc.h> #include <i2c.h> -#include <pmic.h> +#include <power/pmic.h> #include <fsl_pmic.h> #include <mc34704.h>
@@ -110,11 +110,18 @@ int board_init(void) int board_late_init(void) { struct pmic *p; + int ret;
mx25pdk_fec_init();
- pmic_init(); - p = get_pmic(); + ret = pmic_init(I2C_PMIC); + if (ret) + return ret; + + p = pmic_get("FSL_PMIC"); + if (!p) + return -ENODEV; + /* Turn on Ethernet PHY supply */ pmic_reg_write(p, MC34704_GENERAL2_REG, ONOFFE);
diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index b5338a0..bbb3161 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -108,9 +108,9 @@ #define CONFIG_SYS_FSL_ESDHC_NUM 1
/* PMIC Configs */ -#define CONFIG_PMIC -#define CONFIG_PMIC_I2C -#define CONFIG_PMIC_FSL +#define CONFIG_POWER +#define CONFIG_POWER_I2C +#define CONFIG_POWER_FSL #define CONFIG_PMIC_FSL_MC34704 #define CONFIG_SYS_FSL_PMIC_I2C_ADDR 0x54