[U-Boot] [PATCH 0/3] imx:mx6: change CONFIG_SYS_FSL_ESDHC_ADDR
If board_mmc_init failed and returns with -1, cpu_mmc_init will invoke fsl_esdhc_mmc_init. fsl_esdhc_mmc_init will use CONFIG_SYS_FSL_ESDHC_ADDR to initialize SDHCx, so use USDHCx_BASE_ADDR to redefine the config macro.
If not use USDHCx_BASE_ADDR to define CONFIG_SYS_FSL_ESDHC_ADDR, fsl_esdhc_mmc_init will use wrong base address to initialize SDHCx.
Peng Fan (3): imx:mx6sxsabresd: change CONFIG_SYS_FSL_ESDHC_ADDR imx:mx6qarm2: change CONFIG_SYS_FSL_ESDHC_ADDR imx:mx6slevk: change CONFIG_SYS_FSL_ESDHC_ADDR
include/configs/mx6qarm2.h | 2 +- include/configs/mx6slevk.h | 2 +- include/configs/mx6sxsabresd.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
Define CONFIG_SYS_FSL_ESDHC_ADDR using USDHC4_BASE_ADDR which is used in board_mmc_init.
If board_mmc_init failed, cpu_mmc_init->fsl_esdhc_mmc_init will use CONFIG_SYS_FSL_ESDHC_ADDR to initialize sdhc. So set this macro to correct value.
Signed-off-by: Peng Fan Peng.Fan@freescale.com --- include/configs/mx6sxsabresd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 1eda65e..c36ab23 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -159,7 +159,7 @@ /* MMC Configuration */ #define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC -#define CONFIG_SYS_FSL_ESDHC_ADDR 0 +#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC4_BASE_ADDR
#define CONFIG_MMC #define CONFIG_CMD_MMC
On 15/09/2014 08:59, Peng Fan wrote:
Define CONFIG_SYS_FSL_ESDHC_ADDR using USDHC4_BASE_ADDR which is used in board_mmc_init.
If board_mmc_init failed, cpu_mmc_init->fsl_esdhc_mmc_init will use CONFIG_SYS_FSL_ESDHC_ADDR to initialize sdhc. So set this macro to correct value.
Signed-off-by: Peng Fan Peng.Fan@freescale.com
Applied to u-boot-imx, thanks !
Best regards, Stefano Babic
Define CONFIG_SYS_FSL_ESDHC_ADDR using USDHC4_BASE_ADDR.
USDHC3 and USDHC4 are both initialized in board_mmc_init. There is no restriction on USDHC3 addr or USDHC4 addr should be assigned to CONFIG_SYS_FSL_ESDHC_ADDR. So, just choose USDHC4_BASE_ADDR to avoid errors when fsl_esdhc_mmc_init is invoked.
Signed-off-by: Peng Fan Peng.Fan@freescale.com --- include/configs/mx6qarm2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index fd651cf..fc0e284 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -35,7 +35,7 @@ /* MMC Configs */ #define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC -#define CONFIG_SYS_FSL_ESDHC_ADDR 0 +#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC4_BASE_ADDR #define CONFIG_SYS_FSL_USDHC_NUM 2
#define CONFIG_MMC
On 15/09/2014 08:59, Peng Fan wrote:
Define CONFIG_SYS_FSL_ESDHC_ADDR using USDHC4_BASE_ADDR.
USDHC3 and USDHC4 are both initialized in board_mmc_init. There is no restriction on USDHC3 addr or USDHC4 addr should be assigned to CONFIG_SYS_FSL_ESDHC_ADDR. So, just choose USDHC4_BASE_ADDR to avoid errors when fsl_esdhc_mmc_init is invoked.
Signed-off-by: Peng Fan Peng.Fan@freescale.com
Applied to u-boot-imx, thanks !
Best regards, Stefano Babic
Define CONFIG_SYS_FSL_ESDHC_ADDR using USDHC2_BASE_ADDR which is used in board_mmc_init.
Signed-off-by: Peng Fan Peng.Fan@freescale.com --- include/configs/mx6slevk.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 3d05a64..9a21605 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -38,7 +38,7 @@ /* MMC Configs */ #define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC -#define CONFIG_SYS_FSL_ESDHC_ADDR 0 +#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
#define CONFIG_MMC #define CONFIG_CMD_MMC
On 15/09/2014 08:59, Peng Fan wrote:
Define CONFIG_SYS_FSL_ESDHC_ADDR using USDHC2_BASE_ADDR which is used in board_mmc_init.
Signed-off-by: Peng Fan Peng.Fan@freescale.com
Applied to u-boot-imx, thanks !
Best regards, Stefano Babic
participants (2)
-
Peng Fan -
Stefano Babic