imx:mx6: change CONFIG_SYS_FSL_ESDHC_ADDR
cover 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(-)
Signature · 1 line
1.8.4
PATCH 1/3 imx:mx6sxsabresd: change CONFIG_SYS_FSL_ESDHC_ADDR
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.
--- include/configs/mx6sxsabresd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/mx6sxsabresd.h +1 -1
@@ -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
Signature · 1 line
1.8.4
PATCH 1/3 imx:mx6sxsabresd: change CONFIG_SYS_FSL_ESDHC_ADDR
Quoted 9 lines · Peng Fan
Define
CONFIG_SYS_FSL_ESDHC_ADDRusingUSDHC4_BASE_ADDRwhich is used inboard_mmc_init.If
board_mmc_initfailed,cpu_mmc_init->fsl_esdhc_mmc_initwill useCONFIG_SYS_FSL_ESDHC_ADDRto initialize sdhc. So set this macro to correct value.Signed-off-by Peng Fan <[email protected]>---
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 2/3 imx:mx6qarm2: change CONFIG_SYS_FSL_ESDHC_ADDR
In reply to Peng FanDefine 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.
--- include/configs/mx6qarm2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/mx6qarm2.h +1 -1
@@ -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
Signature · 1 line
1.8.4
PATCH 2/3 imx:mx6qarm2: change CONFIG_SYS_FSL_ESDHC_ADDR
Quoted 9 lines · Peng Fan
Define
CONFIG_SYS_FSL_ESDHC_ADDRusingUSDHC4_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 toCONFIG_SYS_FSL_ESDHC_ADDR. So, just chooseUSDHC4_BASE_ADDRto avoid errors whenfsl_esdhc_mmc_initis invoked.Signed-off-by Peng Fan <[email protected]>---
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 3/3 imx:mx6slevk: change CONFIG_SYS_FSL_ESDHC_ADDR
In reply to Peng FanDefine CONFIG_SYS_FSL_ESDHC_ADDR using USDHC2_BASE_ADDR which is used in board_mmc_init.
--- include/configs/mx6slevk.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/mx6slevk.h +1 -1
@@ -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
Signature · 1 line
1.8.4
PATCH 3/3 imx:mx6slevk: change CONFIG_SYS_FSL_ESDHC_ADDR
Quoted 5 lines · Peng Fan
Define
CONFIG_SYS_FSL_ESDHC_ADDRusingUSDHC2_BASE_ADDRwhich is used inboard_mmc_init.Signed-off-by Peng Fan <[email protected]>---
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================