summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/core/quirks.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2017-12-18 09:12:51 +0100
committerGreg Kroah-Hartman2017-12-18 09:12:51 +0100
commit7f9d04bc568d22e573a10e2a0a316599942786f7 (patch)
tree5cd3f32a22ebcc0f0faed657da2fbeb5dd5592c5 /drivers/mmc/core/quirks.h
parentstaging: pi433: Fix disordered switch case (diff)
parentLinux 4.15-rc4 (diff)
downloadkernel-qcow2-linux-7f9d04bc568d22e573a10e2a0a316599942786f7.tar.gz
kernel-qcow2-linux-7f9d04bc568d22e573a10e2a0a316599942786f7.tar.xz
kernel-qcow2-linux-7f9d04bc568d22e573a10e2a0a316599942786f7.zip
Merge 4.15-rc4 into staging-next
We want the staging fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mmc/core/quirks.h')
-rw-r--r--drivers/mmc/core/quirks.h8
1 files changed, 8 insertions, 0 deletions
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,