Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

[~andy/linux] / drivers / mmc / host / sdhci-of-core.c

diff --git a/drivers/mmc/host/sdhci-of-core.c b/drivers/mmc/host/sdhci-of-core.c
index a6bd448a3b46eb7e8b7cfd3443e6e37ceec056ea..c51b71174c1de1df6dce05482d8b2eb13b4d519e 100644 (file)
--- a/drivers/mmc/host/sdhci-of-core.c
+++ b/drivers/mmc/host/sdhci-of-core.c
@@ -154,6 +154,10 @@ static int __devinit sdhci_of_probe(struct platform_device *ofdev,
                host->ops = &sdhci_of_data->ops;
        }
 
+       if (of_get_property(np, "sdhci,auto-cmd12", NULL))
+               host->quirks |= SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12;
+
+
        if (of_get_property(np, "sdhci,1-bit-only", NULL))
                host->quirks |= SDHCI_QUIRK_FORCE_1_BIT_DATA;