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.

Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 925bab052b074c22317b40b3d7c7900cf7df7515..3ab565e32a6aca624d6f462879a0c19b7cae7697 100644 (file)
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -111,7 +111,7 @@ static int sdio_read_cccr(struct mmc_card *card)
 
        cccr_vsn = data & 0x0f;
 
-       if (cccr_vsn > SDIO_CCCR_REV_1_20) {
+       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;

diff --git a/include/linux/mmc/sdio.h b/include/linux/mmc/sdio.h
index 2a2e9905a2473d4d5db8bad16e5cd62e05e0b10b..e0b1123497b9b5adba34126bc8f187e6c7d98a91 100644 (file)
--- a/include/linux/mmc/sdio.h
+++ b/include/linux/mmc/sdio.h
@@ -72,11 +72,13 @@
 #define  SDIO_CCCR_REV_1_00    0       /* CCCR/FBR Version 1.00 */
 #define  SDIO_CCCR_REV_1_10    1       /* CCCR/FBR Version 1.10 */
 #define  SDIO_CCCR_REV_1_20    2       /* CCCR/FBR Version 1.20 */
+#define  SDIO_CCCR_REV_3_00    3       /* CCCR/FBR Version 3.00 */
 
 #define  SDIO_SDIO_REV_1_00    0       /* SDIO Spec Version 1.00 */
 #define  SDIO_SDIO_REV_1_10    1       /* SDIO Spec Version 1.10 */
 #define  SDIO_SDIO_REV_1_20    2       /* SDIO Spec Version 1.20 */
 #define  SDIO_SDIO_REV_2_00    3       /* SDIO Spec Version 2.00 */
+#define  SDIO_SDIO_REV_3_00    4       /* SDIO Spec Version 3.00 */
 
 #define SDIO_CCCR_SD           0x01