2 files changed, 17 insertions, 7 deletions

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index c814220d214e..34ab77bd12ae 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1674,19 +1674,27 @@ int sdhci_add_host(struct sdhci_host *host)
 
         host->max_clk =
                 (caps & SDHCI_CLOCK_BASE_MASK) >> SDHCI_CLOCK_BASE_SHIFT;
+        host->max_clk *= 1000000;
         if (host->max_clk == 0) {
-                printk(KERN_ERR "%s: Hardware doesn't specify base clock "
-                        "frequency.\n", mmc_hostname(mmc));
-                return -ENODEV;
+                if (!host->ops->get_max_clock) {
+                        printk(KERN_ERR
+                               "%s: Hardware doesn't specify base clock "
+                               "frequency.\n", mmc_hostname(mmc));
+                        return -ENODEV;
+                }
+                host->max_clk = host->ops->get_max_clock(host);
         }
-        host->max_clk *= 1000000;
 
         host->timeout_clk =
                 (caps & SDHCI_TIMEOUT_CLK_MASK) >> SDHCI_TIMEOUT_CLK_SHIFT;
         if (host->timeout_clk == 0) {
-                printk(KERN_ERR "%s: Hardware doesn't specify timeout clock "
-                        "frequency.\n", mmc_hostname(mmc));
-                return -ENODEV;
+                if (!host->ops->get_timeout_clock) {
+                        printk(KERN_ERR
+                               "%s: Hardware doesn't specify timeout clock "
+                               "frequency.\n", mmc_hostname(mmc));
+                        return -ENODEV;
+                }
+                host->timeout_clk = host->ops->get_timeout_clock(host);
         }
         if (caps & SDHCI_TIMEOUT_CLK_UNIT)
                 host->timeout_clk *= 1000;
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 6980f2725b85..aab0652a4585 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -285,6 +285,8 @@ struct sdhci_ops {
 #endif
 
         int             (*enable_dma)(struct sdhci_host *host);
+        unsigned int    (*get_max_clock)(struct sdhci_host *host);
+        unsigned int    (*get_timeout_clock)(struct sdhci_host *host);
 };
 
 #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS