summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/mmc/fsl_esdhc.c10
-rw-r--r--include/configs/P1022DS.h1
2 files changed, 11 insertions, 0 deletions
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index 48e7830bd3..9812b00e62 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -78,6 +78,10 @@ uint esdhc_xfertyp(struct mmc_cmd *cmd, struct mmc_data *data)
if (data->blocks > 1) {
xfertyp |= XFERTYP_MSBSEL;
xfertyp |= XFERTYP_BCEN;
+#ifdef CONFIG_FSL_ESDHC_AUTOCMD12
+ /* For P1022 errata */
+ xfertyp |= XFERTYP_AC12EN;
+#endif
}
if (data->flags & MMC_DATA_READ)
@@ -155,6 +159,12 @@ esdhc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data)
uint irqstat;
volatile struct fsl_esdhc *regs = mmc->priv;
+#ifdef CONFIG_FSL_ESDHC_AUTOCMD12
+ /* For P1022 errata */
+ if (cmd->cmdidx == MMC_CMD_STOP_TRANSMISSION)
+ return 0;
+#endif
+
out_be32(&regs->irqstat, -1);
sync();
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 85c7a94a61..52e7720f6d 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -551,6 +551,7 @@ extern unsigned long calculate_board_ddr_clk(unsigned long dummy);
#ifdef CONFIG_MMC
#define CONFIG_CMD_MMC
#define CONFIG_FSL_ESDHC
+#define CONFIG_FSL_ESDHC_AUTOCMD12
#define CONFIG_GENERIC_MMC
#define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR
#endif