diff options
| author | Adrian Hunter <adrian.hunter@intel.com> | 2011-09-23 12:48:21 +0300 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2011-10-26 16:32:15 -0400 |
| commit | f7c56ef2af5ae7e4c24c3c79427b38d18ba1d294 (patch) | |
| tree | 5590da07839d9a07b7811a8fe0104aaa596e03dc /drivers/mmc | |
| parent | 0d7d85ca6e5dc7bd426d1d5989a44e93e8c7a0d3 (diff) | |
| download | linux-3.10-f7c56ef2af5ae7e4c24c3c79427b38d18ba1d294.tar.gz linux-3.10-f7c56ef2af5ae7e4c24c3c79427b38d18ba1d294.tar.bz2 linux-3.10-f7c56ef2af5ae7e4c24c3c79427b38d18ba1d294.zip | |
mmc: block: support no access to boot partitions
Intel Medfield platform blocks access to eMMC boot partitions which
results in switch errors. Since there is no access, mmcboot0/1
devices should not be created. Add a host capability to reflect that.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/card/block.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci-pci.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index d7eb2c08233..aa66d3f3abb 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1480,7 +1480,7 @@ static int mmc_blk_alloc_parts(struct mmc_card *card, struct mmc_blk_data *md) if (!mmc_card_mmc(card)) return 0; - if (card->ext_csd.boot_size) { + if (card->ext_csd.boot_size && mmc_boot_partition_access(card->host)) { ret = mmc_blk_alloc_part(card, md, EXT_CSD_PART_CONFIG_ACC_BOOT0, card->ext_csd.boot_size >> 9, true, diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c index 3b30c515cbc..f8a17f98f3a 100644 --- a/drivers/mmc/host/sdhci-pci.c +++ b/drivers/mmc/host/sdhci-pci.c @@ -215,6 +215,8 @@ static int mfd_emmc_probe_slot(struct sdhci_pci_slot *slot) slot->host->mmc->caps |= MMC_CAP_8_BIT_DATA; + slot->host->mmc->caps2 = MMC_CAP2_BOOTPART_NOACC; + return 0; } |