diff options
| author | Troy Kisky <troy.kisky@boundarydevices.com> | 2012-03-24 14:57:29 -0700 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2012-06-24 16:34:39 -0700 |
| commit | 8f5f53dccfa67cf2f0978d922535b0d991dbdbf5 (patch) | |
| tree | 1e81493ee8b156eac6cdeed1255c255e590f3507 | |
| parent | 30ca74947760a52016f1541648668cccff1e1094 (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 1862c70ac13d..b5e41ff8791b 100644 --- a/arch/arm/plat-mxc/include/mach/esdhc.h +++ b/arch/arm/plat-mxc/include/mach/esdhc.h @@ -26,6 +26,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)(int clock); }; diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index 74c2eb063f1f..29fe9c7029fd 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -719,6 +719,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; if (cpu_is_mx6()) { |