mmc: avoid getting CID on SDIO-only cards
PATCH 1/41 mmc: avoid getting CID on SDIO-only cards
From: David Vrabel <[email protected]>
The introduction of support for SD combo cards breaks the initialization of all CSR SDIO chips. The GO_IDLE (CMD0) in mmc_sd_get_cid() causes CSR chips to be reset (this is non-standard behavior).
When initializing an SDIO card check for a combo card by using the memory present bit in the R4 response to IO_SEND_OP_COND (CMD5). This avoids the call to mmc_sd_get_cid() on an SDIO-only card.
Signed-off-by David Vrabel <[email protected]>
Acked-by Michal Mirolaw <[email protected]>
Cc <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/mmc/core/sdio.c | 5 ++--- include/linux/mmc/sdio.h | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/mmc/core/sdio.c renamed from drivers/mmc/core/sdio.c~mmc-avoid-getting-cid-on-sdio-only-cards +2 -3
@@ -362,9 +362,8 @@ static int mmc_sdio_init_card(struct mmc goto err; } - err =mmc_sd_get_cid (host, host->ocr & ocr, card->raw_cid); - -if (!err) { +if (ocr &R4_MEMORY_PRESENT + &&mmc_sd_get_cid (host, host->ocr & ocr, card->raw_cid) ==0 ) { card->type =MMC_TYPE_SD_COMBO ; if (oldcard && (oldcard->type != MMC_TYPE_SD_COMBO ||
include/linux/mmc/sdio.h renamed from include/linux/mmc/sdio.h~mmc-avoid-getting-cid-on-sdio-only-cards +2 -0
@@ -38,6 +38,8 @@* [8:0] Byte/block count */ +#define R4_MEMORY_PRESENT (1 << 27) +/* SDIO status in R5 Type
_