Merge branch 'v3.0-4460-fixes' into omap-pm-integration

1 files changed, 9 insertions, 4 deletions

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 922c77196d6..2f54e4b6d72 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -166,6 +166,7 @@ struct omap_hsmmc_host {
         unsigned int            id;
         unsigned int            dma_len;
         unsigned int            dma_sg_idx;
+        unsigned int            master_clock;
         unsigned char           bus_mode;
         unsigned char           power_mode;
         u32                     *buffer;
@@ -676,11 +677,11 @@ static int omap_hsmmc_context_restore(struct omap_hsmmc_host *host)
         }
 
         if (ios->clock) {
-                dsor = OMAP_MMC_MASTER_CLOCK / ios->clock;
+                dsor = host->master_clock / ios->clock;
                 if (dsor < 1)
                         dsor = 1;
 
-                if (OMAP_MMC_MASTER_CLOCK / dsor > ios->clock)
+                if (host->master_clock / dsor > ios->clock)
                         dsor++;
 
                 if (dsor > 250)
@@ -1593,11 +1594,11 @@ static void omap_hsmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
         }
 
         if (ios->clock) {
-                dsor = OMAP_MMC_MASTER_CLOCK / ios->clock;
+                dsor = host->master_clock / ios->clock;
                 if (dsor < 1)
                         dsor = 1;
 
-                if (OMAP_MMC_MASTER_CLOCK / dsor > ios->clock)
+                if (host->master_clock / dsor > ios->clock)
                         dsor++;
 
                 if (dsor > 250)
@@ -2078,6 +2079,10 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
         host->base      = ioremap(host->mapbase, SZ_4K);
         host->power_mode = -1;
 
+        host->master_clock = OMAP_MMC_MASTER_CLOCK;
+        if (mmc_slot(host).features & HSMMC_HAS_48MHZ_MASTER_CLK)
+                host->master_clock = OMAP_MMC_MASTER_CLOCK / 2;
+
         platform_set_drvdata(pdev, host);
         INIT_WORK(&host->mmc_carddetect_work, omap_hsmmc_detect);