commit 365124f20dad611c57b74289042d0b929bcc6976
author Linux Build Service Account <lnxbuild@localhost> Thu Jun 07 03:08:43 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Jun 07 03:08:43 2018 -0700
tree e77d76990a05e6df6927145b9d600087a1933b51
parent e4fb3ba9422e8ba16c8c37b9b3579e0fceec1b9b
parent 4dc439fee1a8c3b73f86b46a96f21046a8aad66f

Merge "ipq40xx: mmc: Added erase quirk for eMMC part"

drivers/mmc/mmc.c

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index e2c3c86..34ab736 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -1515,6 +1515,9 @@
 	if (((mmc->cid[0] & MMC_MID_MASK) == MMC_MID_SANDISK) &&
 		(strncmp(mmc->block_dev.product, "SEM08", 5) == 0))
 		mmc->quirks |= MMC_QUIRK_SECURE_TRIM;
+	if (((mmc->cid[0] & MMC_MID_MASK) == MMC_MID_TOSHIBA) &&
+		(strncmp(mmc->block_dev.product, "004GE", 5) == 0))
+		mmc->quirks |= MMC_QUIRK_SECURE_TRIM;
 
 	return 0;
 }

include/mmc.h

diff --git a/include/mmc.h b/include/mmc.h
index 68bd128..ee18ae3 100644
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -301,6 +301,7 @@
 
 #define MMC_MID_MASK (0xFF << 24)
 #define MMC_MID_SANDISK (0x45 << 24)
+#define MMC_MID_TOSHIBA (0x11 << 24)
 
 /*
  * Quirks