Skip to contentSkip to conversation

imx:mx6: change CONFIG_SYS_FSL_ESDHC_ADDR

PATCH New Peng Fan 2 participants 7 messages Sep 15, 2014 – Sep 16, 2014

lore
Share & tools
lore

Peng Fan

author
#0 lore raw

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
author
#1 lore raw

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
index 1eda65e..c36ab23 100644
@@ -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
#2 lore raw

PATCH 1/3 imx:mx6sxsabresd: change CONFIG_SYS_FSL_ESDHC_ADDR

Quoted 9 lines · Peng Fan

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.

---

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
=====================================================================
author
#3 lore raw

PATCH 2/3 imx:mx6qarm2: change CONFIG_SYS_FSL_ESDHC_ADDR

In reply to Peng Fan

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.

---
 include/configs/mx6qarm2.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/mx6qarm2.h +1 -1
index fd651cf..fc0e284 100644
@@ -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
#4 lore raw

PATCH 2/3 imx:mx6qarm2: change CONFIG_SYS_FSL_ESDHC_ADDR

Quoted 9 lines · Peng Fan

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.

---

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
=====================================================================
author
#5 lore raw

PATCH 3/3 imx:mx6slevk: change CONFIG_SYS_FSL_ESDHC_ADDR

In reply to Peng Fan

Define 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
index 3d05a64..9a21605 100644
@@ -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
#6 lore raw

PATCH 3/3 imx:mx6slevk: change CONFIG_SYS_FSL_ESDHC_ADDR

Quoted 5 lines · Peng Fan

Define CONFIG_SYS_FSL_ESDHC_ADDR using USDHC2_BASE_ADDR which is used in board_mmc_init.

---

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
=====================================================================