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

Commit c59d4473 authored by Chris Ball's avatar Chris Ball
Browse files

mmc: card: Use manufacturer ID symbols in card quirks. 



No functional change; adds macros for card manufacturer IDs.

Signed-off-by: default avatarChris Ball <cjb@laptop.org>
Cc: Andrei E. Warkentin <andrey.warkentin@gmail.com>
Cc: Stefan Nilsson XK <stefan.xk.nilsson@stericsson.com>
parent df16219f

drivers/mmc/card/block.c

+18 −9
Original line number Diff line number Diff line
@@ -1584,13 +1584,22 @@ static int mmc_add_disk(struct mmc_blk_data *md) 
	return ret;

}



#define CID_MANFID_SANDISK	0x2

#define CID_MANFID_TOSHIBA	0x11

#define CID_MANFID_MICRON	0x13



static const struct mmc_fixup blk_fixups[] =

{

	MMC_FIXUP("SEM02G", 0x2, 0x100, add_quirk, MMC_QUIRK_INAND_CMD38),

	MMC_FIXUP("SEM04G", 0x2, 0x100, add_quirk, MMC_QUIRK_INAND_CMD38),

	MMC_FIXUP("SEM08G", 0x2, 0x100, add_quirk, MMC_QUIRK_INAND_CMD38),

	MMC_FIXUP("SEM16G", 0x2, 0x100, add_quirk, MMC_QUIRK_INAND_CMD38),

	MMC_FIXUP("SEM32G", 0x2, 0x100, add_quirk, MMC_QUIRK_INAND_CMD38),

	MMC_FIXUP("SEM02G", CID_MANFID_SANDISK, 0x100, add_quirk,

		  MMC_QUIRK_INAND_CMD38),

	MMC_FIXUP("SEM04G", CID_MANFID_SANDISK, 0x100, add_quirk,

		  MMC_QUIRK_INAND_CMD38),

	MMC_FIXUP("SEM08G", CID_MANFID_SANDISK, 0x100, add_quirk,

		  MMC_QUIRK_INAND_CMD38),

	MMC_FIXUP("SEM16G", CID_MANFID_SANDISK, 0x100, add_quirk,

		  MMC_QUIRK_INAND_CMD38),

	MMC_FIXUP("SEM32G", CID_MANFID_SANDISK, 0x100, add_quirk,

		  MMC_QUIRK_INAND_CMD38),



	/*

	 * Some MMC cards experience performance degradation with CMD23
@@ -1600,18 +1609,18 @@ static const struct mmc_fixup blk_fixups[] = 
	 *

	 * N.B. This doesn't affect SD cards.

	 */

	MMC_FIXUP("MMC08G", 0x11, CID_OEMID_ANY, add_quirk_mmc,

	MMC_FIXUP("MMC08G", CID_MANFID_TOSHIBA, CID_OEMID_ANY, add_quirk_mmc,

		  MMC_QUIRK_BLK_NO_CMD23),

	MMC_FIXUP("MMC16G", 0x11, CID_OEMID_ANY, add_quirk_mmc,

	MMC_FIXUP("MMC16G", CID_MANFID_TOSHIBA, CID_OEMID_ANY, add_quirk_mmc,

		  MMC_QUIRK_BLK_NO_CMD23),

	MMC_FIXUP("MMC32G", 0x11, CID_OEMID_ANY, add_quirk_mmc,

	MMC_FIXUP("MMC32G", CID_MANFID_TOSHIBA, CID_OEMID_ANY, add_quirk_mmc,

		  MMC_QUIRK_BLK_NO_CMD23),



	/*

	 * Some Micron MMC cards needs longer data read timeout than

	 * indicated in CSD.

	 */

	MMC_FIXUP(CID_NAME_ANY, 0x13, 0x200, add_quirk_mmc,

	MMC_FIXUP(CID_NAME_ANY, CID_MANFID_MICRON, 0x200, add_quirk_mmc,

		  MMC_QUIRK_LONG_READ_TIME),



	END_FIXUP