|
@@ -106,7 +106,7 @@ static uint esdhc_xfertyp(struct mmc_cmd *cmd, struct mmc_data *data)
|
|
|
xfertyp |= XFERTYP_RSPTYP_48;
|
|
|
|
|
|
#if defined(CONFIG_MX53) || defined(CONFIG_PPC_T4240) || \
|
|
|
- defined(CONFIG_LS102XA) || defined(CONFIG_LS2085A)
|
|
|
+ defined(CONFIG_LS102XA) || defined(CONFIG_FSL_LAYERSCAPE)
|
|
|
if (cmd->cmdidx == MMC_CMD_STOP_TRANSMISSION)
|
|
|
xfertyp |= XFERTYP_CMDTYP_ABORT;
|
|
|
#endif
|
|
@@ -184,7 +184,7 @@ static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data)
|
|
|
int timeout;
|
|
|
struct fsl_esdhc_cfg *cfg = mmc->priv;
|
|
|
struct fsl_esdhc *regs = (struct fsl_esdhc *)cfg->esdhc_base;
|
|
|
-#ifdef CONFIG_LS2085A
|
|
|
+#ifdef CONFIG_FSL_LAYERSCAPE
|
|
|
dma_addr_t addr;
|
|
|
#endif
|
|
|
uint wml_value;
|
|
@@ -197,7 +197,7 @@ static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data)
|
|
|
|
|
|
esdhc_clrsetbits32(®s->wml, WML_RD_WML_MASK, wml_value);
|
|
|
#ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO
|
|
|
-#ifdef CONFIG_LS2085A
|
|
|
+#ifdef CONFIG_FSL_LAYERSCAPE
|
|
|
addr = virt_to_phys((void *)(data->dest));
|
|
|
if (upper_32_bits(addr))
|
|
|
printf("Error found for upper 32 bits\n");
|
|
@@ -223,7 +223,7 @@ static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data)
|
|
|
esdhc_clrsetbits32(®s->wml, WML_WR_WML_MASK,
|
|
|
wml_value << 16);
|
|
|
#ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO
|
|
|
-#ifdef CONFIG_LS2085A
|
|
|
+#ifdef CONFIG_FSL_LAYERSCAPE
|
|
|
addr = virt_to_phys((void *)(data->src));
|
|
|
if (upper_32_bits(addr))
|
|
|
printf("Error found for upper 32 bits\n");
|
|
@@ -277,7 +277,7 @@ static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data)
|
|
|
static void check_and_invalidate_dcache_range
|
|
|
(struct mmc_cmd *cmd,
|
|
|
struct mmc_data *data) {
|
|
|
-#ifdef CONFIG_LS2085A
|
|
|
+#ifdef CONFIG_FSL_LAYERSCAPE
|
|
|
unsigned start = 0;
|
|
|
#else
|
|
|
unsigned start = (unsigned)data->dest ;
|
|
@@ -285,7 +285,7 @@ static void check_and_invalidate_dcache_range
|
|
|
unsigned size = roundup(ARCH_DMA_MINALIGN,
|
|
|
data->blocks*data->blocksize);
|
|
|
unsigned end = start+size ;
|
|
|
-#ifdef CONFIG_LS2085A
|
|
|
+#ifdef CONFIG_FSL_LAYERSCAPE
|
|
|
dma_addr_t addr;
|
|
|
|
|
|
addr = virt_to_phys((void *)(data->dest));
|