mmc: mmci: Enforce mmc capabilities through DT

Remove the option to provide the flags for mmc capabilities as platform
data, enforce it through DT.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Ulf Hansson
2014-03-21 10:29:10 +01:00
parent 4593df29b9
commit 3faf80dfa3
2 changed files with 0 additions and 7 deletions

View File

@@ -1519,8 +1519,6 @@ static int mmci_probe(struct amba_device *dev,
dev_warn(mmc_dev(mmc), "Platform OCR mask is ignored\n");
/* DT takes precedence over platform data. */
mmc->caps = np ? mmc->caps : plat->capabilities;
mmc->caps2 = np ? mmc->caps2 : plat->capabilities2;
if (!np) {
if (!plat->cd_invert)
mmc->caps2 |= MMC_CAP2_CD_ACTIVE_HIGH;