Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4625dab authored by Bing Zhao's avatar Bing Zhao Committed by Chris Ball
Browse files

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: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent f2815f68

drivers/mmc/core/sdio.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/linux/mmc/sdio.h

+2 −0
Original line number Diff line number Diff line
@@ -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