[PATCH 05/12] mmc: core: disable full power cycle for SD4.0

micky_ching
2015-04-29T01:34:32Z

We should not do power cycle when card is in SD4.0 mode,
if we power off, we should detect UHSII interface again.
so we can disable it when card is in UHSII mode.

Signed-off-by: Micky Ching <micky_ching@realsil.com.cn>
Signed-off-by: Wei Wang <wei_wang@realsil.com.cn>
---
drivers/mmc/core/core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index ebb6fea..4c5433b 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1550,7 +1550,8 @@ u32 mmc_select_voltage(struct mmc_host *host, u32 ocr)
return 0;
}

- if (host->caps2 & MMC_CAP2_FULL_PWR_CYCLE) {
+ if (!mmc_card_uhsii(host->card) &&
+ (host->caps2 & MMC_CAP2_FULL_PWR_CYCLE)) {
bit = ffs(ocr) - 1;
ocr &= 3 << bit;
mmc_power_cycle(host, ocr);
--
1.9.1