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

MLK-14938-10 fsl_esdhc: Update usdhc driver to support i.MX8 

Add CONFIG_MX8 to use the 64bits support in usdhc driver.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit ec3bed8d0a73cea364981839c7a8ea716640c92f)
This commit is contained in:
Ye Li 2017-03-24 15:13:09 +08:00
parent 5b443e3e26
commit a89a8bf416
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mmc/fsl_esdhc.c
View File

@ -259,7 +259,7 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc,
int timeout; int timeout;
struct fsl_esdhc *regs = priv->esdhc_regs; struct fsl_esdhc *regs = priv->esdhc_regs;
#if defined(CONFIG_FSL_LAYERSCAPE) || defined(CONFIG_S32V234) || \ #if defined(CONFIG_FSL_LAYERSCAPE) || defined(CONFIG_S32V234) || \
defined(CONFIG_IMX8M) defined(CONFIG_IMX8) || defined(CONFIG_IMX8M)
dma_addr_t addr; dma_addr_t addr;
#endif #endif
uint wml_value; uint wml_value;
@ -273,7 +273,7 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc,
esdhc_clrsetbits32(&regs->wml, WML_RD_WML_MASK, wml_value); esdhc_clrsetbits32(&regs->wml, WML_RD_WML_MASK, wml_value);
#ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO #ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO
#if defined(CONFIG_FSL_LAYERSCAPE) || defined(CONFIG_S32V234) || \ #if defined(CONFIG_FSL_LAYERSCAPE) || defined(CONFIG_S32V234) || \
defined(CONFIG_IMX8M) defined(CONFIG_IMX8) || defined(CONFIG_IMX8M)
addr = virt_to_phys((void *)(data->dest)); addr = virt_to_phys((void *)(data->dest));
if (upper_32_bits(addr)) if (upper_32_bits(addr))
printf("Error found for upper 32 bits\n"); printf("Error found for upper 32 bits\n");
@ -310,7 +310,7 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc,
wml_value << 16); wml_value << 16);
#ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO #ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO
#if defined(CONFIG_FSL_LAYERSCAPE) || defined(CONFIG_S32V234) || \ #if defined(CONFIG_FSL_LAYERSCAPE) || defined(CONFIG_S32V234) || \
defined(CONFIG_IMX8M) defined(CONFIG_IMX8) || defined(CONFIG_IMX8M)
addr = virt_to_phys((void *)(data->src)); addr = virt_to_phys((void *)(data->src));
if (upper_32_bits(addr)) if (upper_32_bits(addr))
printf("Error found for upper 32 bits\n"); printf("Error found for upper 32 bits\n");
@ -376,7 +376,7 @@ static void check_and_invalidate_dcache_range
unsigned size = roundup(ARCH_DMA_MINALIGN, unsigned size = roundup(ARCH_DMA_MINALIGN,
data->blocks*data->blocksize); data->blocks*data->blocksize);
#if defined(CONFIG_FSL_LAYERSCAPE) || defined(CONFIG_S32V234) || \ #if defined(CONFIG_FSL_LAYERSCAPE) || defined(CONFIG_S32V234) || \
defined(CONFIG_IMX8M) defined(CONFIG_IMX8) || defined(CONFIG_IMX8M)
dma_addr_t addr; dma_addr_t addr;
addr = virt_to_phys((void *)(data->dest)); addr = virt_to_phys((void *)(data->dest));