From 64ac4350ec82ef387fb256527250a460727f6f7c Mon Sep 17 00:00:00 2001 From: Bing Zhao Date: Thu, 20 Oct 2011 19:16:32 -0700 Subject: mmc: recognise SDIO cards with SDIO_CCCR_REV 3.00 Table 6-2: CCCR bit Definitions, address 00h. Part E1 SDIO Simplified Specification Version 3.00, Feb. 25, 2011. This patch has been tested with Marvell WLAN device SD8797. Reviewed-on: http://git-master/r/72877 Change-Id: I1ea3b63bde2bbe8532459205f61feffae3e30f0a Signed-off-by: Bing Zhao Signed-off-by: Chris Ball Signed-off-by: Pavan Kunapuli Reviewed-by: Simone Willett Tested-by: Simone Willett Signed-off-by: Varun Wadekar Reviewed-on: http://git-master/r/74581 Reviewed-by: Automatic_Commit_Validation_User --- drivers/mmc/core/sdio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers') diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index fce904bcacb7..3d8a5e41a488 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -116,8 +116,8 @@ static int sdio_read_cccr(struct mmc_card *card) cccr_vsn = data & 0x0f; - if (cccr_vsn > SDIO_CCCR_REV_1_20) { - printk(KERN_ERR "%s: unrecognised CCCR structure version %d\n", + if (cccr_vsn > SDIO_CCCR_REV_3_00) { + pr_err("%s: unrecognised CCCR structure version %d\n", mmc_hostname(card->host), cccr_vsn); return -EINVAL; } @@ -645,7 +645,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, (MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 | MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR104 | MMC_CAP_UHS_DDR50))) { - err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180); + err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180, true); if (err) { ocr &= ~R4_18V_PRESENT; host->ocr &= ~R4_18V_PRESENT; @@ -781,7 +781,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, goto remove; /* Card is an ultra-high-speed card */ - mmc_card_set_uhs(card); + mmc_sd_card_set_uhs(card); } else { /* * Switch to high-speed (if supported). -- cgit v1.2.3