diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2017-12-11 13:56:08 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2017-12-11 13:56:08 +0100 |
| commit | e828b53afd7f631365e0d668c1fc720843d9af06 (patch) | |
| tree | 6920a41f22653b852b85cf8aa275f7d1f179de69 /drivers/mmc/core | |
| parent | 8726059a671a645d6e8079a1adc8c63f958f88ce (diff) | |
| parent | 91516a2a4734614d62ee3ed921f8f88acc67c000 (diff) | |
| download | linux-e828b53afd7f631365e0d668c1fc720843d9af06.tar.bz2 | |
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/mmc/core')
| -rw-r--r-- | drivers/mmc/core/card.h | 2 | ||||
| -rw-r--r-- | drivers/mmc/core/quirks.h | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/mmc/core/card.h b/drivers/mmc/core/card.h index f06cd91964ce..79a5b985ccf5 100644 --- a/drivers/mmc/core/card.h +++ b/drivers/mmc/core/card.h @@ -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 diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h index f664e9cbc9f8..75d317623852 100644 --- a/drivers/mmc/core/quirks.h +++ b/drivers/mmc/core/quirks.h @@ -53,6 +53,14 @@ static const struct mmc_fixup mmc_blk_fixups[] = { 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. */ MMC_FIXUP(CID_NAME_ANY, CID_MANFID_MICRON, 0x200, add_quirk_mmc, |