aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorDaniel Mack <zonque@gmail.com>2012-02-19 07:20:33 -0500
committerChris Ball <cjb@laptop.org>2012-03-27 12:19:56 -0400
commitd418ed87c4e3ecf45d42718c4ead91180997681f (patch)
tree8da29767609df1b6eced0f1121a0f1e8325e3327 /arch/arm/mach-omap2
parentb81cfc413047181a8f2599cacf927dc09a81a123 (diff)
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 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/hsmmc.c1
-rw-r--r--arch/arm/mach-omap2/hsmmc.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
index 19dd1657245c..9abab0f52f79 100644
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@@ -316,6 +316,7 @@ static int omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
316 mmc->slots[0].pm_caps = c->pm_caps; 316 mmc->slots[0].pm_caps = c->pm_caps;
317 mmc->slots[0].internal_clock = !c->ext_clock; 317 mmc->slots[0].internal_clock = !c->ext_clock;
318 mmc->dma_mask = 0xffffffff; 318 mmc->dma_mask = 0xffffffff;
319 mmc->max_freq = c->max_freq;
319 if (cpu_is_omap44xx()) 320 if (cpu_is_omap44xx())
320 mmc->reg_offset = OMAP4_MMC_REG_OFFSET; 321 mmc->reg_offset = OMAP4_MMC_REG_OFFSET;
321 else 322 else
diff --git a/arch/arm/mach-omap2/hsmmc.h b/arch/arm/mach-omap2/hsmmc.h
index c4409730c4bb..0017ae24995e 100644
--- a/arch/arm/mach-omap2/hsmmc.h
+++ b/arch/arm/mach-omap2/hsmmc.h
@@ -26,6 +26,8 @@ struct omap2_hsmmc_info {
26 char *name; /* or NULL for default */ 26 char *name; /* or NULL for default */
27 struct device *dev; /* returned: pointer to mmc adapter */ 27 struct device *dev; /* returned: pointer to mmc adapter */
28 int ocr_mask; /* temporary HACK */ 28 int ocr_mask; /* temporary HACK */
29 int max_freq; /* maximum clock, if constrained by external
30 * circuitry, or 0 for default */
29 /* Remux (pad configuration) when powering on/off */ 31 /* Remux (pad configuration) when powering on/off */
30 void (*remux)(struct device *dev, int slot, int power_on); 32 void (*remux)(struct device *dev, int slot, int power_on);
31 /* init some special card */ 33 /* init some special card */