Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[deliverable/linux.git] / drivers / mmc / core / host.c

diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 1be42fab1a3051a77523abf093bb3cbf057bc32c..98f25ffb42583a1f5c70258fd2f4bd9c55d6f00e 100644 (file)
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -313,6 +313,14 @@ int mmc_of_parse(struct mmc_host *host)
                host->caps2 |= MMC_CAP2_HS400_1_8V | MMC_CAP2_HS200_1_8V_SDR;
        if (of_property_read_bool(np, "mmc-hs400-1_2v"))
                host->caps2 |= MMC_CAP2_HS400_1_2V | MMC_CAP2_HS200_1_2V_SDR;
+       if (of_property_read_bool(np, "mmc-hs400-enhanced-strobe"))
+               host->caps2 |= MMC_CAP2_HS400_ES;
+       if (of_property_read_bool(np, "no-sdio"))
+               host->caps2 |= MMC_CAP2_NO_SDIO;
+       if (of_property_read_bool(np, "no-sd"))
+               host->caps2 |= MMC_CAP2_NO_SD;
+       if (of_property_read_bool(np, "no-mmc"))
+               host->caps2 |= MMC_CAP2_NO_MMC;
 
        host->dsr_req = !of_property_read_u32(np, "dsr", &host->dsr);
        if (host->dsr_req && (host->dsr & ~0xffff)) {