From 179266eaba14eb09d4a058ccb4d33e2fa6da5828 Mon Sep 17 00:00:00 2001 From: Adrian Hunter Date: Tue, 13 Mar 2012 05:19:13 -0400 Subject: [PATCH] --- yaml --- r: 297346 b: refs/heads/master c: 83bb24aaa4af2ec7c127cc2a5fa7ca9f64cdd13d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mmc/core/mmc.c | 3 ++- trunk/include/linux/mmc/host.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f31cd0873b6e..e892cf2d18d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2cecdf002300bca86ce83b17a60f907d5a4ce7dc +refs/heads/master: 83bb24aaa4af2ec7c127cc2a5fa7ca9f64cdd13d diff --git a/trunk/drivers/mmc/core/mmc.c b/trunk/drivers/mmc/core/mmc.c index d7d8a93c3503..02914d609a91 100644 --- a/trunk/drivers/mmc/core/mmc.c +++ b/trunk/drivers/mmc/core/mmc.c @@ -952,7 +952,8 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, * If enhanced_area_en is TRUE, host needs to enable ERASE_GRP_DEF * bit. This bit will be lost every time after a reset or power off. */ - if (card->ext_csd.enhanced_area_en) { + if (card->ext_csd.enhanced_area_en || + (card->ext_csd.rev >= 3 && (host->caps2 & MMC_CAP2_HC_ERASE_SZ))) { err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_ERASE_GROUP_DEF, 1, card->ext_csd.generic_cmd6_time); diff --git a/trunk/include/linux/mmc/host.h b/trunk/include/linux/mmc/host.h index e05bd241c676..33a4d08d810e 100644 --- a/trunk/include/linux/mmc/host.h +++ b/trunk/include/linux/mmc/host.h @@ -236,6 +236,7 @@ struct mmc_host { MMC_CAP2_HS200_1_2V_SDR) #define MMC_CAP2_BROKEN_VOLTAGE (1 << 7) /* Use the broken voltage */ #define MMC_CAP2_DETECT_ON_ERR (1 << 8) /* On I/O err check card removal */ +#define MMC_CAP2_HC_ERASE_SZ (1 << 9) /* High-capacity erase size */ mmc_pm_flag_t pm_caps; /* supported pm features */ unsigned int power_notify_type;