diff options
| author | Ye Li <ye.li@nxp.com> | 2017-02-07 21:33:57 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2017-03-14 21:27:09 +0800 |
| commit | 88c32ab51fdc54fe029f03b1da80f58d0f0f78a6 (patch) | |
| tree | 9fa0dbc1040f0441195b9e011fe66e70958fb029 /include | |
| parent | e24af9f06b30eb24400684d5a0fdd4e654af4e38 (diff) | |
| download | u-boot-imx-88c32ab51fdc54fe029f03b1da80f58d0f0f78a6.zip u-boot-imx-88c32ab51fdc54fe029f03b1da80f58d0f0f78a6.tar.gz u-boot-imx-88c32ab51fdc54fe029f03b1da80f58d0f0f78a6.tar.bz2 | |
MLK-14420-3 mx6qsabresd: Update mx6qsabresd to enable OF_CONTROL and DM drivers
Modify and remove configurations conflicts with DM drivers from head file.
Enable DM drivers and OF_CONTROL in defconfig.
Also update the GPIO usage to call gpio_request before any gpio using, and
update power_init_board since the PMIC APIs are changed in Pfuze DM driver.
Signed-off-by: Ye Li <ye.li@nxp.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mx6sabre_common.h | 2 | ||||
| -rw-r--r-- | include/configs/mx6sabresd.h | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index a2ab77a..6f5d69b 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -201,7 +201,7 @@ #define CONFIG_ENV_IS_IN_MMC #if defined(CONFIG_ENV_IS_IN_MMC) -#define CONFIG_ENV_OFFSET (768 * 1024) +#define CONFIG_ENV_OFFSET (896 * 1024) #endif /* Framebuffer */ diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 598ab9a..824f29d 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -48,18 +48,23 @@ #endif /* I2C Configs */ +#ifndef CONFIG_DM_I2C #define CONFIG_SYS_I2C +#endif +#ifdef CONFIG_CMD_I2C #define CONFIG_SYS_I2C_MXC #define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ #define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ #define CONFIG_SYS_I2C_SPEED 100000 +#endif -/* PMIC */ +#ifndef CONFIG_DM_PMIC #define CONFIG_POWER #define CONFIG_POWER_I2C #define CONFIG_POWER_PFUZE100 -#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#endif /* USB Configs */ #ifdef CONFIG_CMD_USB |