From 2200f08046011c98ec6a6f1b981f98f896a1152e Mon Sep 17 00:00:00 2001 From: JaeHun Jung Date: Sat, 23 Feb 2019 19:19:15 +0900 Subject: [PATCH] [RAMEN9610-12589][COMMON] mmc: dw_mmc: Disable mmc erase(discard) for slow device format. Android StorageManagerService has timeout(180 sec) for format. But, Some devices are over the timeout. (Because, Spend time for erase.) Change-Id: If5d38642d28b3937dceeca80048bc3813b27f41d Signed-off-by: JaeHun Jung --- drivers/mmc/host/dw_mmc.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index a5b097368de8..43abd0112e7f 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -3342,12 +3342,6 @@ static int dw_mci_init_slot_caps(struct dw_mci_slot *slot) if (host->pdata->caps) mmc->caps |= host->pdata->caps; - /* - * Support MMC_CAP_ERASE by default. - * It needs to use trim/discard/erase commands. - */ - mmc->caps |= MMC_CAP_ERASE; - if (host->pdata->pm_caps) mmc->pm_caps |= host->pdata->pm_caps; -- 2.20.1