summaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorDaniel Mack <zonque@gmail.com>2012-02-19 13:20:33 +0100
committerChris Ball <cjb@laptop.org>2012-03-27 12:19:56 -0400
commitd418ed87c4e3ecf45d42718c4ead91180997681f (patch)
tree8da29767609df1b6eced0f1121a0f1e8325e3327 /drivers/mmc
parentb81cfc413047181a8f2599cacf927dc09a81a123 (diff)
downloadlinux-3.10-d418ed87c4e3ecf45d42718c4ead91180997681f.tar.gz
linux-3.10-d418ed87c4e3ecf45d42718c4ead91180997681f.tar.bz2
linux-3.10-d418ed87c4e3ecf45d42718c4ead91180997681f.zip
ARM: OMAP: hsmmc: add max_freq field
External circuitry like level shifters may limit the maximum operation speed of the hsmmc controller. Add a field to struct omap2_hsmmc_info so boards can adjust the setting on demand. Signed-off-by: Daniel Mack <zonque@gmail.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/omap_hsmmc.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index fd0c661bbad..36e7f5bc58a 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1912,8 +1912,12 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
if (mmc_slot(host).vcc_aux_disable_is_sleep)
mmc_slot(host).no_off = 1;
- mmc->f_min = OMAP_MMC_MIN_CLOCK;
- mmc->f_max = OMAP_MMC_MAX_CLOCK;
+ mmc->f_min = OMAP_MMC_MIN_CLOCK;
+
+ if (pdata->max_freq > 0)
+ mmc->f_max = pdata->max_freq;
+ else
+ mmc->f_max = OMAP_MMC_MAX_CLOCK;
spin_lock_init(&host->irq_lock);