|
@@ -257,7 +257,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_MX8M)
|
|
|
|
|
|
+ defined(CONFIG_IMX8) || defined(CONFIG_MX8M)
|
|
dma_addr_t addr;
|
|
dma_addr_t addr;
|
|
#endif
|
|
#endif
|
|
uint wml_value;
|
|
uint wml_value;
|
|
@@ -271,7 +271,7 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc,
|
|
esdhc_clrsetbits32(®s->wml, WML_RD_WML_MASK, wml_value);
|
|
esdhc_clrsetbits32(®s->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_MX8M)
|
|
|
|
|
|
+ defined(CONFIG_IMX8) || defined(CONFIG_MX8M)
|
|
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");
|
|
@@ -301,7 +301,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_MX8M)
|
|
|
|
|
|
+ defined(CONFIG_IMX8) || defined(CONFIG_MX8M)
|
|
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");
|
|
@@ -367,7 +367,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_MX8M)
|
|
|
|
|
|
+ defined(CONFIG_IMX8) || defined(CONFIG_MX8M)
|
|
dma_addr_t addr;
|
|
dma_addr_t addr;
|
|
|
|
|
|
addr = virt_to_phys((void *)(data->dest));
|
|
addr = virt_to_phys((void *)(data->dest));
|