From: Pierre Ossman <drzeus@drzeus.cx>
Date: Sun, 8 Jan 2006 14:23:02 +0000 (+0000)
Subject: [MMC] Support MMC version 4 cards
X-Git-Tag: v2.6.16-rc1~662^2~3
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb757b4eefd4600a3afa58f6983addbbe82989a8;p=linux-2.6

[MMC] Support MMC version 4 cards

Version 4 of the MMC specification increased the version number of the
CID structure. None of the fields changed though so the only required
change is adding '4' to the approved list.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 6696f71363..bfca5c176e 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -495,6 +495,7 @@ static void mmc_decode_cid(struct mmc_card *card)
 
 		case 2: /* MMC v2.0 - v2.2 */
 		case 3: /* MMC v3.1 - v3.3 */
+		case 4: /* MMC v4 */
 			card->cid.manfid	= UNSTUFF_BITS(resp, 120, 8);
 			card->cid.oemid		= UNSTUFF_BITS(resp, 104, 16);
 			card->cid.prod_name[0]	= UNSTUFF_BITS(resp, 96, 8);