LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i.mx: fsl_esdhc: add the i.mx6q support 

The mmc host controller on the i.mx6q is called usdhc which
is redesigned based on the freescale esdhc controller.

The usdhc controller is almost compatible with esdhc except
it adds one mix register to support debug/SD3.0 and move
the low bit 0-6 of XFERTYP register to the mix control reg
low bit 0-6. Thus on i.mx6q, we have the following compared
with the previous soc: (can refer to RM of chapter 56.3.3)

i.mx6q:
mix control:
bit 31 - bit 7: Added for debug/SD3.0 support
bit 6  - bit 0: move in the XFERTYP register bit 6-0 on previous soc
XFERTYP register:
bit 31 - bit 7: the same as before,
bit 6  - bit 0: no-use

previous soc
mix control: no
XFERTYP register:
bit 31 - bit 0: xfertype information

Signed-off-by: Jason Liu <jason.hui@linaro.org>
Cc: Andy Fleming <afleming@gmail.com>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Stefano Babic <sbabic@denx.de>
This commit is contained in:
Jason Liu 2011-11-25 00:18:04 +00:00 committed by Andy Fleming
parent 9a420986cc
commit 4692708d45
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/mmc/fsl_esdhc.c
View File

@ -58,7 +58,8 @@ struct fsl_esdhc {
uint autoc12err; uint autoc12err;
uint hostcapblt; uint hostcapblt;
uint wml; uint wml;
char reserved1[8]; uint mixctrl;
char reserved1[4];
uint fevt; uint fevt;
char reserved2[168]; char reserved2[168];
uint hostver; uint hostver;
@ -298,8 +299,13 @@ esdhc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data)
/* Send the command */ /* Send the command */
esdhc_write32(&regs->cmdarg, cmd->cmdarg); esdhc_write32(&regs->cmdarg, cmd->cmdarg);
#if defined(CONFIG_FSL_USDHC)
esdhc_write32(&regs->mixctrl,
(esdhc_read32(&regs->mixctrl) & 0xFFFFFF80) | (xfertyp & 0x7F));
esdhc_write32(&regs->xfertyp, xfertyp & 0xFFFF0000);
#else
esdhc_write32(&regs->xfertyp, xfertyp); esdhc_write32(&regs->xfertyp, xfertyp);
#endif
/* Wait for the command to complete */ /* Wait for the command to complete */
while (!(esdhc_read32(&regs->irqstat) & IRQSTAT_CC)) while (!(esdhc_read32(&regs->irqstat) & IRQSTAT_CC))
; ;
@ -482,7 +488,7 @@ int fsl_esdhc_initialize(bd_t *bis, struct fsl_esdhc_cfg *cfg)
mmc = malloc(sizeof(struct mmc)); mmc = malloc(sizeof(struct mmc));
sprintf(mmc->name, "FSL_ESDHC"); sprintf(mmc->name, "FSL_SDHC");
regs = (struct fsl_esdhc *)cfg->esdhc_base; regs = (struct fsl_esdhc *)cfg->esdhc_base;
/* First reset the eSDHC controller */ /* First reset the eSDHC controller */