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

Commit 07a20ed1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v4.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc 

Pull MMC fixes from Ulf Hansson:
 "A couple of MMC fixes:

   - fix use of uninitialized drv_typ variable

   - apply NO_CMD23 quirk to some specific SD cards to make them work"

* tag 'mmc-v4.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: core: apply NO_CMD23 quirk to some specific cards
  mmc: core: properly init drv_type
parents dd3d66b8 91516a2a

drivers/mmc/core/card.h

+2 −0
Original line number Diff line number Diff line
@@ -75,9 +75,11 @@ struct mmc_fixup { 
#define EXT_CSD_REV_ANY (-1u)



#define CID_MANFID_SANDISK      0x2

#define CID_MANFID_ATP          0x9

#define CID_MANFID_TOSHIBA      0x11

#define CID_MANFID_MICRON       0x13

#define CID_MANFID_SAMSUNG      0x15

#define CID_MANFID_APACER       0x27

#define CID_MANFID_KINGSTON     0x70

#define CID_MANFID_HYNIX	0x90

drivers/mmc/core/mmc.c

+1 −1
Original line number Diff line number Diff line
@@ -1290,7 +1290,7 @@ int mmc_hs400_to_hs200(struct mmc_card *card) 


static void mmc_select_driver_type(struct mmc_card *card)

{

	int card_drv_type, drive_strength, drv_type;

	int card_drv_type, drive_strength, drv_type = 0;

	int fixed_drv_type = card->host->fixed_drv_type;



	card_drv_type = card->ext_csd.raw_driver_strength |

drivers/mmc/core/quirks.h

+8 −0
Original line number Diff line number Diff line
@@ -52,6 +52,14 @@ static const struct mmc_fixup mmc_blk_fixups[] = { 
	MMC_FIXUP("MMC32G", CID_MANFID_TOSHIBA, CID_OEMID_ANY, add_quirk_mmc,

		  MMC_QUIRK_BLK_NO_CMD23),



	/*

	 * Some SD cards lockup while using CMD23 multiblock transfers.

	 */

	MMC_FIXUP("AF SD", CID_MANFID_ATP, CID_OEMID_ANY, add_quirk_sd,

		  MMC_QUIRK_BLK_NO_CMD23),

	MMC_FIXUP("APUSD", CID_MANFID_APACER, 0x5048, add_quirk_sd,

		  MMC_QUIRK_BLK_NO_CMD23),



	/*

	 * Some MMC cards need longer data read timeout than indicated in CSD.

	 */