bcm2835-mmc: Add option to disable MMC_QUIRK_BLK_NO_CMD23

raspberrypi · Apr 18, 2015 · d34769d · d34769d
1 parent 622cc72
commit d34769d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/drivers/mmc/core/quirks.c b/drivers/mmc/core/quirks.c
@@ -98,6 +98,8 @@ void mmc_fixup_device(struct mmc_card *card, const struct mmc_fixup *table)
 	/* SDHCI on BCM2708 - bug causes a certain sequence of CMD23 operations to fail.
 	 * Disable this flag for all cards (fall-back to CMD25/CMD18 multi-block transfers).
 	 */
+	extern unsigned mmc_debug;
+	if (!(mmc_debug & (1<<13)))
 	card->quirks |= MMC_QUIRK_BLK_NO_CMD23;
 }
 EXPORT_SYMBOL(mmc_fixup_device);
diff --git a/drivers/mmc/host/bcm2835-mmc.c b/drivers/mmc/host/bcm2835-mmc.c
@@ -71,7 +71,7 @@ pr_debug(DRIVER_NAME " [%s()]: " f, __func__, ## x)
 #define BCM2835_VCMMU_SHIFT		(0x7E000000 - BCM2708_PERI_BASE)
 
 
-static unsigned mmc_debug;
+/*static */unsigned mmc_debug;
 
 struct bcm2835_host {
 	spinlock_t				lock;