Merge branch 'omap-fixes'

[linux-2.6-omap-h63xx.git] / drivers / mmc / host / sdhci.c

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 75d0ecbce10c9857bed947d154bdde16955b3334..30d8e3d4e6fdbc727605aa3f99563980c38940dd 100644 (file)
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -134,6 +134,7 @@ static void sdhci_disable_card_detection(struct sdhci_host *host)
 static void sdhci_reset(struct sdhci_host *host, u8 mask)
 {
        unsigned long timeout;
+       u32 uninitialized_var(ier);
 
        if (host->quirks & SDHCI_QUIRK_NO_CARD_NO_RESET) {
                if (!(sdhci_readl(host, SDHCI_PRESENT_STATE) &
@@ -141,6 +142,9 @@ static void sdhci_reset(struct sdhci_host *host, u8 mask)
                        return;
        }
 
+       if (host->quirks & SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET)
+               ier = sdhci_readl(host, SDHCI_INT_ENABLE);
+
        sdhci_writeb(host, mask, SDHCI_SOFTWARE_RESET);
 
        if (mask & SDHCI_RESET_ALL)
@@ -160,6 +164,9 @@ static void sdhci_reset(struct sdhci_host *host, u8 mask)
                timeout--;
                mdelay(1);
        }
+
+       if (host->quirks & SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET)
+               sdhci_clear_set_irqs(host, SDHCI_INT_ALL_MASK, ier);
 }
 
 static void sdhci_init(struct sdhci_host *host)
@@ -336,6 +343,9 @@ static void sdhci_transfer_pio(struct sdhci_host *host)
                mask = ~0;
 
        while (sdhci_readl(host, SDHCI_PRESENT_STATE) & mask) {
+               if (host->quirks & SDHCI_QUIRK_PIO_NEEDS_DELAY)
+                       udelay(100);
+
                if (host->data->flags & MMC_DATA_READ)
                        sdhci_read_block_pio(host);
                else
@@ -1767,13 +1777,19 @@ int sdhci_add_host(struct sdhci_host *host)
         * Maximum block size. This varies from controller to controller and
         * is specified in the capabilities register.
         */
-       mmc->max_blk_size = (caps & SDHCI_MAX_BLOCK_MASK) >> SDHCI_MAX_BLOCK_SHIFT;
-       if (mmc->max_blk_size >= 3) {
-               printk(KERN_WARNING "%s: Invalid maximum block size, "
-                       "assuming 512 bytes\n", mmc_hostname(mmc));
-               mmc->max_blk_size = 512;
-       } else
-               mmc->max_blk_size = 512 << mmc->max_blk_size;
+       if (host->quirks & SDHCI_QUIRK_FORCE_BLK_SZ_2048) {
+               mmc->max_blk_size = 2;
+       } else {
+               mmc->max_blk_size = (caps & SDHCI_MAX_BLOCK_MASK) >>
+                               SDHCI_MAX_BLOCK_SHIFT;
+               if (mmc->max_blk_size >= 3) {
+                       printk(KERN_WARNING "%s: Invalid maximum block size, "
+                               "assuming 512 bytes\n", mmc_hostname(mmc));
+                       mmc->max_blk_size = 0;
+               }
+       }
+
+       mmc->max_blk_size = 512 << mmc->max_blk_size;
 
        /*
         * Maximum block count.