diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2014-03-21 10:29:10 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-05-12 12:52:45 +0200 |
| commit | 3faf80dfa342e98b5780e0b78b7a670c7b61a9be (patch) | |
| tree | 290a72b267802b0dd612f1d98ab77853d1669a15 /drivers/mmc/host/mmci.c | |
| parent | 4593df29b94b31de931dc20d7da2e6c468c8d473 (diff) | |
| download | op-kernel-dev-3faf80dfa342e98b5780e0b78b7a670c7b61a9be.zip op-kernel-dev-3faf80dfa342e98b5780e0b78b7a670c7b61a9be.tar.gz | |
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/host/mmci.c')
| -rw-r--r-- | drivers/mmc/host/mmci.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index c0353f8..9c60325 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, 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; |
