diff options
| author | Troy Kisky <troy.kisky@boundarydevices.com> | 2012-03-24 14:57:29 -0700 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2012-10-14 14:30:41 -0700 |
| commit | 86d3c152aae2b63b957fbc8dce5142b02738dd4a (patch) | |
| tree | 0e1cbca35b47365c3fa6cb00a302a67b5bfa838c | |
| parent | 70bc75160c3eb18be944ee37d0e23fef081c3dc3 (diff) | |
mmc: esdhc: add caps flag to esdhc_platform_data
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/esdhc.h | 1 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci-esdhc-imx.c | 1 |
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 e1736869034d..2e3330c8665b 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -849,6 +849,7 @@ static int esdhc_pltfm_init(struct sdhci_host *host, struct sdhci_pltfm_data *pd host->ocr_avail_sd |= MMC_VDD_165_195; 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); |