drivers: esdhc: add support for ColdFire mcf5441x family

This patch has been tested on the mcf54415-based stmark2
board. The eSDHC driver works reliably using DMA mode.

Signed-off-by: Angelo Dureghello <angelo@sysam.it>
This commit is contained in:
Angelo Dureghello 2019-01-19 10:40:38 +01:00 committed by Tom Rini
parent 293a172b67
commit 1f15cb8f5b
2 changed files with 43 additions and 1 deletions

View file

@ -384,6 +384,25 @@ static void check_and_invalidate_dcache_range
invalidate_dcache_range(start, end); invalidate_dcache_range(start, end);
} }
#ifdef CONFIG_MCF5441x
/*
* Swaps 32-bit words to little-endian byte order.
*/
static inline void sd_swap_dma_buff(struct mmc_data *data)
{
int i, size = data->blocksize >> 2;
u32 *buffer = (u32 *)data->dest;
u32 sw;
while (data->blocks--) {
for (i = 0; i < size; i++) {
sw = __sw32(*buffer);
*buffer++ = sw;
}
}
}
#endif
/* /*
* Sends a command out on the bus. Takes the mmc pointer, * Sends a command out on the bus. Takes the mmc pointer,
* a command pointer, and an optional data pointer. * a command pointer, and an optional data pointer.
@ -546,8 +565,12 @@ static int esdhc_send_cmd_common(struct fsl_esdhc_priv *priv, struct mmc *mmc,
* cache-fill during the DMA operations such as the * cache-fill during the DMA operations such as the
* speculative pre-fetching etc. * speculative pre-fetching etc.
*/ */
if (data->flags & MMC_DATA_READ) if (data->flags & MMC_DATA_READ) {
check_and_invalidate_dcache_range(cmd, data); check_and_invalidate_dcache_range(cmd, data);
#ifdef CONFIG_MCF5441x
sd_swap_dma_buff(data);
#endif
}
#endif #endif
} }
@ -1029,8 +1052,12 @@ static int esdhc_init_common(struct fsl_esdhc_priv *priv, struct mmc *mmc)
/* Disable the BRR and BWR bits in IRQSTAT */ /* Disable the BRR and BWR bits in IRQSTAT */
esdhc_clrbits32(&regs->irqstaten, IRQSTATEN_BRR | IRQSTATEN_BWR); esdhc_clrbits32(&regs->irqstaten, IRQSTATEN_BRR | IRQSTATEN_BWR);
#ifdef CONFIG_MCF5441x
esdhc_write32(&regs->proctl, PROCTL_INIT | PROCTL_D3CD);
#else
/* Put the PROCTL reg back to the default */ /* Put the PROCTL reg back to the default */
esdhc_write32(&regs->proctl, PROCTL_INIT); esdhc_write32(&regs->proctl, PROCTL_INIT);
#endif
/* Set timout to the maximum value */ /* Set timout to the maximum value */
esdhc_clrsetbits32(&regs->sysctl, SYSCTL_TIMEOUT_MASK, 14 << 16); esdhc_clrsetbits32(&regs->sysctl, SYSCTL_TIMEOUT_MASK, 14 << 16);
@ -1138,6 +1165,11 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv,
if (ret) if (ret)
return ret; return ret;
#ifdef CONFIG_MCF5441x
/* ColdFire, using SDHC_DATA[3] for card detection */
esdhc_write32(&regs->proctl, PROCTL_INIT | PROCTL_D3CD);
#endif
#ifndef CONFIG_FSL_USDHC #ifndef CONFIG_FSL_USDHC
esdhc_setbits32(&regs->sysctl, SYSCTL_PEREN | SYSCTL_HCKEN esdhc_setbits32(&regs->sysctl, SYSCTL_PEREN | SYSCTL_HCKEN
| SYSCTL_IPGEN | SYSCTL_CKEN); | SYSCTL_IPGEN | SYSCTL_CKEN);
@ -1162,6 +1194,15 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv,
voltage_caps = 0; voltage_caps = 0;
caps = esdhc_read32(&regs->hostcapblt); caps = esdhc_read32(&regs->hostcapblt);
#ifdef CONFIG_MCF5441x
/*
* MCF5441x RM declares in more points that sdhc clock speed must
* never exceed 25 Mhz. From this, the HS bit needs to be disabled
* from host capabilities.
*/
caps &= ~ESDHC_HOSTCAPBLT_HSS;
#endif
#ifdef CONFIG_SYS_FSL_ERRATUM_ESDHC135 #ifdef CONFIG_SYS_FSL_ERRATUM_ESDHC135
caps = caps & ~(ESDHC_HOSTCAPBLT_SRS | caps = caps & ~(ESDHC_HOSTCAPBLT_SRS |
ESDHC_HOSTCAPBLT_VS18 | ESDHC_HOSTCAPBLT_VS30); ESDHC_HOSTCAPBLT_VS18 | ESDHC_HOSTCAPBLT_VS30);

View file

@ -106,6 +106,7 @@
#define PROCTL_INIT 0x00000020 #define PROCTL_INIT 0x00000020
#define PROCTL_DTW_4 0x00000002 #define PROCTL_DTW_4 0x00000002
#define PROCTL_DTW_8 0x00000004 #define PROCTL_DTW_8 0x00000004
#define PROCTL_D3CD 0x00000008
#define CMDARG 0x0002e008 #define CMDARG 0x0002e008