aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2014-03-21 05:29:10 -0400
committerUlf Hansson <ulf.hansson@linaro.org>2014-05-12 06:52:45 -0400
commit3faf80dfa342e98b5780e0b78b7a670c7b61a9be (patch)
tree290a72b267802b0dd612f1d98ab77853d1669a15 /drivers/mmc
parent4593df29b94b31de931dc20d7da2e6c468c8d473 (diff)
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>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/mmci.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index c0353f84d5be..9c60325f1a30 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1519,8 +1519,6 @@ static int mmci_probe(struct amba_device *dev,
1519 dev_warn(mmc_dev(mmc), "Platform OCR mask is ignored\n"); 1519 dev_warn(mmc_dev(mmc), "Platform OCR mask is ignored\n");
1520 1520
1521 /* DT takes precedence over platform data. */ 1521 /* DT takes precedence over platform data. */
1522 mmc->caps = np ? mmc->caps : plat->capabilities;
1523 mmc->caps2 = np ? mmc->caps2 : plat->capabilities2;
1524 if (!np) { 1522 if (!np) {
1525 if (!plat->cd_invert) 1523 if (!plat->cd_invert)
1526 mmc->caps2 |= MMC_CAP2_CD_ACTIVE_HIGH; 1524 mmc->caps2 |= MMC_CAP2_CD_ACTIVE_HIGH;