summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/plat-mxc/include/mach/esdhc.h1
-rw-r--r--drivers/mmc/host/sdhci-esdhc-imx.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/esdhc.h b/arch/arm/plat-mxc/include/mach/esdhc.h
index bb15db1ecbc2..294e4cdc338e 100644
--- a/arch/arm/plat-mxc/include/mach/esdhc.h
+++ b/arch/arm/plat-mxc/include/mach/esdhc.h
@@ -34,6 +34,7 @@ struct esdhc_platform_data {
unsigned int support_18v;
unsigned int support_8bit;
unsigned int keep_power_at_suspend;
+ unsigned int caps;
unsigned int delay_line;
int (*platform_pad_change)(unsigned int index, int clock);
};
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 35fd825f4709..7b08196eb4cf 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -855,6 +855,7 @@ static int esdhc_pltfm_init(struct sdhci_host *host, struct sdhci_pltfm_data *pd
if (boarddata->support_8bit)
host->mmc->caps |= MMC_CAP_8_BIT_DATA;
+ host->mmc->caps |= boarddata->caps;
if (boarddata->keep_power_at_suspend)
host->mmc->pm_caps |= (MMC_PM_KEEP_POWER | \
MMC_PM_WAKE_SDIO_IRQ);